diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 3e1841c76bee647b3c8a99ba4a524898b6ad47c2..51771eb6e14a71a41a4ec57b2931f5f123c83e1d 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -242,7 +242,7 @@ - /[a-zA-Z0-9_\.\+\-\\&"'<>/%,]+ + /[a-zA-Z0-9_\.\+\-\\&"'<>/%,:]+ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args new file mode 100644 index 0000000000000000000000000000000000000000..b987a3878fdd9631808561fba42959f59b425992 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb \ +-hda /dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver\ +:hydrar-desktop.win7vm-lun-0 -net none \ +-serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml new file mode 100644 index 0000000000000000000000000000000000000000..e4d9c97541bb9b2137509c061b3b65b71f31a611 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml @@ -0,0 +1,28 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + + +
+ + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ac23e39d3f37b7d19fd46e9dbbe00f47961964b4..17196fd833b679ff2411b7431fee6de5a5e4dc62 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -711,6 +711,7 @@ mymain(void) DO_TEST("hugepages-pages6", NONE); DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); + DO_TEST("disk-iscsi", NONE); DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-network-https", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE,