mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
qemu: support named nbd exports
These are supported by nbd-server and by the NBD server that QEMU embeds for live image access. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
db95213e59
commit
0aa9f522c4
@ -1441,9 +1441,9 @@
|
||||
are "nbd", "rbd", "sheepdog" or "gluster". If the
|
||||
<code>protocol</code> attribute is "rbd", "sheepdog" or "gluster", an
|
||||
additional attribute <code>name</code> is mandatory to specify which
|
||||
volume/image will be used. When the disk <code>type</code> is
|
||||
"network", the <code>source</code> may have zero or
|
||||
more <code>host</code> sub-elements used to specify the hosts
|
||||
volume/image will be used; for "nbd" it is optional. When the disk
|
||||
<code>type</code> is "network", the <code>source</code> may have zero
|
||||
or more <code>host</code> sub-elements used to specify the hosts
|
||||
to connect.
|
||||
<span class="since">Since 0.0.3; <code>type='dir'</code> since
|
||||
0.7.5; <code>type='network'</code> since 0.8.7</span><br/>
|
||||
|
@ -2378,6 +2378,7 @@ qemuParseNBDString(virDomainDiskDefPtr disk)
|
||||
{
|
||||
virDomainDiskHostDefPtr h = NULL;
|
||||
char *host, *port;
|
||||
char *src;
|
||||
|
||||
if (VIR_ALLOC(h) < 0)
|
||||
goto no_memory;
|
||||
@ -2395,11 +2396,24 @@ qemuParseNBDString(virDomainDiskDefPtr disk)
|
||||
if (!h->name)
|
||||
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);
|
||||
if (!src)
|
||||
goto no_memory;
|
||||
} else {
|
||||
src = NULL;
|
||||
}
|
||||
|
||||
VIR_FREE(disk->src);
|
||||
disk->src = src;
|
||||
disk->nhosts = 1;
|
||||
disk->hosts = h;
|
||||
return 0;
|
||||
@ -2503,6 +2517,9 @@ qemuBuildNBDString(virDomainDiskDefPtr disk, virBufferPtr opt)
|
||||
break;
|
||||
}
|
||||
|
||||
if (disk->src)
|
||||
virBufferEscape(opt, ',', ",", ":exportname=%s", disk->src);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -185,6 +185,7 @@ mymain(void)
|
||||
DO_TEST("disk-drive-cache-directsync");
|
||||
DO_TEST("disk-drive-cache-unsafe");
|
||||
DO_TEST("disk-drive-network-nbd");
|
||||
DO_TEST("disk-drive-network-nbd-export");
|
||||
DO_TEST("disk-drive-network-gluster");
|
||||
DO_TEST("disk-drive-network-rbd");
|
||||
DO_TEST("disk-drive-network-rbd-ipv6");
|
||||
|
@ -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:example.org:6000:exportname=bar,if=virtio,format=raw \
|
||||
-net none -serial none -parallel none
|
@ -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 name='example.org' port='6000'/>
|
||||
</source>
|
||||
<target dev='vda' bus='virtio'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0'/>
|
||||
<controller type='ide' index='0'/>
|
||||
<memballoon model='virtio'/>
|
||||
</devices>
|
||||
</domain>
|
@ -493,6 +493,8 @@ mymain(void)
|
||||
QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT);
|
||||
DO_TEST("disk-drive-network-nbd",
|
||||
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-gluster",
|
||||
QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_FORMAT);
|
||||
DO_TEST("disk-drive-network-rbd",
|
||||
|
@ -170,6 +170,7 @@ mymain(void)
|
||||
DO_TEST("disk-drive-cache-v1-wb");
|
||||
DO_TEST("disk-drive-cache-v1-none");
|
||||
DO_TEST("disk-drive-network-nbd");
|
||||
DO_TEST("disk-drive-network-nbd-export");
|
||||
DO_TEST("disk-scsi-device");
|
||||
DO_TEST("disk-scsi-vscsi");
|
||||
DO_TEST("disk-scsi-virtio-scsi");
|
||||
|
Loading…
Reference in New Issue
Block a user