11:44 a.m.
This reuses the XML format that was introduced for Gluster.
Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com>
---
docs/formatdomain.html.in | 8 ++--
src/qemu/qemu_command.c | 49 +++++++++++++++-------
tests/qemuargv2xmltest.c | 1 +
.../qemuxml2argv-disk-drive-network-nbd-unix.args | 5 +++
.../qemuxml2argv-disk-drive-network-nbd-unix.xml | 33 +++++++++++++++
tests/qemuxml2argvtest.c | 2 +
tests/qemuxml2xmltest.c | 1 +
7 files changed, 80 insertions(+), 19 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.xml
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 90cfc03..094b509 100644
--- 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 4762f0a..89cd065 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2138,25 +2138,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);
@@ -2261,6 +2270,14 @@ qemuBuildNBDString(virDomainDiskDefPtr disk, virBufferPtr opt)
virBufferEscape(opt, ',', ",", ":%s",
disk->hosts->port ? disk->hosts->port :
"10809");
break;
+ case VIR_DOMAIN_DISK_PROTO_TRANS_UNIX:
+ if (!disk->hosts->socket) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("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 1731022..12174b3 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -183,6 +183,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
index 0000000..afea187
--- /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
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 7d44be2..db09633 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -487,6 +487,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 cdf6554..d698f59 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -168,6 +168,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");
--
1.8.1.2