[PATCH 11/12] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Integrate 'hostdev-scsi-virtio-iscsi' case

We can add the iSCSI hostdevs to the same test file. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../hostdev-scsi-virtio-iscsi.args | 39 -------------- .../hostdev-scsi-virtio-iscsi.xml | 42 --------------- ...hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 8 +++ ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 10 ++++ ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 10 ++++ .../hostdev-scsi-virtio-scsi.xml | 12 +++++ tests/qemuxml2argvtest.c | 3 -- .../hostdev-scsi-virtio-iscsi.xml | 51 ------------------- .../hostdev-scsi-virtio-scsi.xml | 12 +++++ tests/qemuxml2xmltest.c | 3 -- 10 files changed, 52 insertions(+), 138 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args deleted file mode 100644 index 050e74a449d..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args +++ /dev/null @@ -1,39 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-QEMUGuest2 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i386 \ --name QEMUGuest2 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ --drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,if=none,\ -format=raw,id=drive-hostdev0 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\ -drive=drive-hostdev0,id=hostdev0 \ --drive file=iscsi://example.org:3260/iqn.1992-01.com.example/1,if=none,\ -format=raw,id=drive-hostdev1 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,\ -drive=drive-hostdev1,id=hostdev1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml deleted file mode 100644 index 88684c94054..00000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.xml +++ /dev/null @@ -1,42 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest2</name> - <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</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-system-i386</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='scsi' index='0' model='virtio-scsi'/> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> - <host name='example.org' port='3260'/> - </source> - <address type='drive' controller='0' bus='0' target='2' unit='4'/> - </hostdev> - <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> - <host name='example.org' port='3260'/> - </source> - <address type='drive' controller='0' bus='0' target='2' unit='5'/> - </hostdev> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args index 50353df478c..c4b0b7ef7f6 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args @@ -37,5 +37,13 @@ drive=drive-hostdev0,id=hostdev0 \ -drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=7,\ drive=drive-hostdev1,id=hostdev1 \ +-drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,if=none,\ +format=raw,id=drive-hostdev2 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\ +drive=drive-hostdev2,id=hostdev2 \ +-drive file=iscsi://example.org:3260/iqn.1992-01.com.example/1,if=none,\ +format=raw,id=drive-hostdev3 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,\ +drive=drive-hostdev3,id=hostdev3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index e0680fce4cf..c691b1dc050 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -36,6 +36,16 @@ drive=drive-hostdev0,id=hostdev0 \ -drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=7,\ drive=drive-hostdev1,id=hostdev1 \ +-drive file.driver=iscsi,file.portal=example.org:3260,\ +file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,if=none,\ +format=raw,id=drive-hostdev2 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\ +drive=drive-hostdev2,id=hostdev2 \ +-drive file.driver=iscsi,file.portal=example.org:3260,\ +file.target=iqn.1992-01.com.example,file.lun=1,file.transport=tcp,if=none,\ +format=raw,id=drive-hostdev3 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,\ +drive=drive-hostdev3,id=hostdev3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index 0da84d08b30..6d00994e4d5 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -40,6 +40,16 @@ drive=drive-hostdev0,id=hostdev0 \ -drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=7,\ drive=drive-hostdev1,id=hostdev1 \ +-drive file.driver=iscsi,file.portal=example.org:3260,\ +file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,if=none,\ +format=raw,id=drive-hostdev2 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\ +drive=drive-hostdev2,id=hostdev2 \ +-drive file.driver=iscsi,file.portal=example.org:3260,\ +file.target=iqn.1992-01.com.example,file.lun=1,file.transport=tcp,if=none,\ +format=raw,id=drive-hostdev3 \ +-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,\ +drive=drive-hostdev3,id=hostdev3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml index 013c8cd17f7..eec78b1c736 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml @@ -40,6 +40,18 @@ <readonly/> <address type='drive' controller='0' bus='0' target='4' unit='7'/> </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source protocol='iscsi' name='iqn.1992-01.com.example'> + <host name='example.org' port='3260'/> + </source> + <address type='drive' controller='0' bus='0' target='2' unit='4'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <host name='example.org' port='3260'/> + </source> + <address type='drive' controller='0' bus='0' target='2' unit='5'/> + </hostdev> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e10d90fbf88..7a001b797a7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2663,9 +2663,6 @@ mymain(void) DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); - DO_TEST("hostdev-scsi-virtio-iscsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi-auth", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml deleted file mode 100644 index 4addf5ebc87..00000000000 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-iscsi.xml +++ /dev/null @@ -1,51 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest2</name> - <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</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-system-i386</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='scsi' index='0' model='virtio-scsi'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </controller> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/0'> - <host name='example.org' port='3260'/> - </source> - <address type='drive' controller='0' bus='0' target='2' unit='4'/> - </hostdev> - <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> - <host name='example.org' port='3260'/> - </source> - <address type='drive' controller='0' bus='0' target='2' unit='5'/> - </hostdev> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml index a1fa36de386..a8d70ef31be 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml @@ -47,6 +47,18 @@ <readonly/> <address type='drive' controller='0' bus='0' target='4' unit='7'/> </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source protocol='iscsi' name='iqn.1992-01.com.example/0'> + <host name='example.org' port='3260'/> + </source> + <address type='drive' controller='0' bus='0' target='2' unit='4'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <host name='example.org' port='3260'/> + </source> + <address type='drive' controller='0' bus='0' target='2' unit='5'/> + </hostdev> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </memballoon> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d3da788979d..edbd75039d3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1039,9 +1039,6 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-virtio-iscsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi-auth", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); -- 2.26.2