qemu: support NBD with Unix sockets

This reuses the XML format that was introduced for Gluster.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index db3d171c3c8602fc79a1f2933fcc41d8dcd05a57..8a3c3b7686228d55d56006c90524470556cc2c3e 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1713,9 +1713,11 @@
             <td> only one </td>
           </tr>
         </table>
-        In case of gluster, valid values for transport attribute are tcp, rdma
-        or unix. If nothing is specified, tcp is assumed. If transport is unix,
-        socket attribute specifies path to unix socket.
+        gluster supports "tcp", "rdma", "unix" as valid values for the
+        transport attribute.  nbd supports "tcp" and "unix".  Others only
+        support "tcp".  If nothing is specified, "tcp" is assumed. If the
+        transport is "unix", the socket attribute specifies the path to an
+        AF_UNIX socket.
       </dd>
       <dt><code>address</code></dt>
       <dd>If present, the <code>address</code> element ties the disk

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0d2083ffc7950160a7387e598dca1e389c23b353..63478f72cd917efdb643b09c606368c349604e24 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2384,25 +2384,34 @@ qemuParseNBDString(virDomainDiskDefPtr disk)
         goto no_memory;
 
     host = disk->src + strlen("nbd:");
-    port = strchr(host, ':');
-    if (!port) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("cannot parse nbd filename '%s'"), disk->src);
-        goto error;
-    }
+    if (STRPREFIX(host, "unix:/")) {
+        src = strchr(host + strlen("unix:"), ':');
+        if (src)
+            *src++ = '\0';
 
-    *port++ = '\0';
-    h->name = strdup(host);
-    if (!h->name)
-        goto no_memory;
+        h->transport = VIR_DOMAIN_DISK_PROTO_TRANS_UNIX;
+        h->socket = strdup(host + strlen("unix:"));
+    } else {
+        port = strchr(host, ':');
+        if (!port) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("cannot parse nbd filename '%s'"), disk->src);
+            goto error;
+        }
 
-    src = strchr(port, ':');
-    if (src)
-        *src++ = '\0';
+        *port++ = '\0';
+        h->name = strdup(host);
+        if (!h->name)
+            goto no_memory;
 
-    h->port = strdup(port);
-    if (!h->port)
-        goto no_memory;
+        src = strchr(port, ':');
+        if (src)
+            *src++ = '\0';
+
+        h->port = strdup(port);
+        if (!h->port)
+            goto no_memory;
+    }
 
     if (src && STRPREFIX(src, "exportname=")) {
         src = strdup(strchr(src, '=') + 1);
@@ -2510,6 +2519,14 @@ qemuBuildNBDString(virDomainDiskDefPtr disk, virBufferPtr opt)
                         disk->hosts->port ? disk->hosts->port :
                         QEMU_DEFAULT_NBD_PORT);
         break;
+    case VIR_DOMAIN_DISK_PROTO_TRANS_UNIX:
+        if (!disk->hosts->socket) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("socket attribute required for unix transport"));
+            return -1;
+        }
+        virBufferEscape(opt, ',', ",", "unix:%s", disk->hosts->socket);
+        break;
     default:
         transp = virDomainDiskProtocolTransportTypeToString(disk->hosts->transport);
         virReportError(VIR_ERR_INTERNAL_ERROR,

diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 24f8129c124492994ad970cc3bccef2a0aa9d7d3..a2842337765aabc5673505d8b5e49866c6d61504 100644 (file)
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -186,6 +186,7 @@ mymain(void)
     DO_TEST("disk-drive-cache-unsafe");
     DO_TEST("disk-drive-network-nbd");
     DO_TEST("disk-drive-network-nbd-export");
+    DO_TEST("disk-drive-network-nbd-unix");
     DO_TEST("disk-drive-network-gluster");
     DO_TEST("disk-drive-network-rbd");
     DO_TEST("disk-drive-network-rbd-ipv6");

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
new file mode 100644 (file)
index 0000000..977b68f
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
@@ -0,0 +1,5 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
+pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \
+-no-acpi -boot c -usb -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0 \
+-drive file=nbd:unix:/var/run/nbdsock:exportname=bar,if=virtio,format=raw \
+-net none -serial none -parallel none

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
new file mode 100644 (file)
index 0000000..46114d5
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
@@ -0,0 +1,33 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda' bus='ide'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <disk type='network' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source protocol='nbd' name='bar'>
+        <host transport='unix' socket='/var/run/nbdsock'/>
+      </source>
+      <target dev='vda' bus='virtio'/>
+    </disk>
+    <controller type='usb' index='0'/>
+    <controller type='ide' index='0'/>
+    <memballoon model='virtio'/>
+  </devices>
+</domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 52ecb9240ed41b1f3f3768db1db2439f593f5ea7..f5e7ced053ac541cd4b283b649fcdb7053f33635 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -495,6 +495,8 @@ mymain(void)
             QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-nbd-export",
             QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
+    DO_TEST("disk-drive-network-nbd-unix",
+            QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-gluster",
             QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
     DO_TEST("disk-drive-network-rbd",

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index e699fd17310e44a1491928f0f5c506ab0cffde1f..33ea45e50ed82101180858f3ebdd70cfcfe0e358 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -171,6 +171,7 @@ mymain(void)
     DO_TEST("disk-drive-cache-v1-none");
     DO_TEST("disk-drive-network-nbd");
     DO_TEST("disk-drive-network-nbd-export");
+    DO_TEST("disk-drive-network-nbd-unix");
     DO_TEST("disk-scsi-device");
     DO_TEST("disk-scsi-vscsi");
     DO_TEST("disk-scsi-virtio-scsi");