]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: block: Add JSON props generator for NBD storage backing
authorPeter Krempa <pkrempa@redhat.com>
Thu, 13 Jul 2017 13:48:06 +0000 (15:48 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 7 Nov 2017 15:11:38 +0000 (16:11 +0100)
src/qemu/qemu_block.c

index 428c0b465597b832b88b722ec2491a01570b417c..e5792fb9c446f46b4cc9db357060cb74c7338915 100644 (file)
@@ -775,6 +775,34 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src)
 }
 
 
+static virJSONValuePtr
+qemuBlockStorageSourceGetNBDProps(virStorageSourcePtr src)
+{
+    virJSONValuePtr serverprops;
+    virJSONValuePtr ret = NULL;
+
+    if (src->nhosts != 1) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("nbd protocol accepts only one host"));
+        return NULL;
+    }
+
+    serverprops = qemuBlockStorageSourceBuildJSONSocketAddress(&src->hosts[0],
+                                                               false);
+    if (!serverprops)
+        return NULL;
+
+    ignore_value(virJSONValueObjectCreate(&ret,
+                                          "s:driver", "nbd",
+                                          "a:server", serverprops,
+                                          "S:export", src->path,
+                                          "S:tls-creds", src->tlsAlias,
+                                          NULL));
+
+    return ret;
+}
+
+
 /**
  * qemuBlockStorageSourceGetBackendProps:
  * @src: disk source
@@ -830,6 +858,10 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src)
             break;
 
         case VIR_STORAGE_NET_PROTOCOL_NBD:
+            if (!(fileprops = qemuBlockStorageSourceGetNBDProps(src)))
+                return NULL;
+            break;
+
         case VIR_STORAGE_NET_PROTOCOL_RBD:
         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
         case VIR_STORAGE_NET_PROTOCOL_SSH: