Remove the disk from tests focusing on other aspects so that change to
-blockdev will touch less tests.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
.../channel-unix-guestfwd.x86_64-2.5.0.args | 2 --
.../channel-unix-guestfwd.x86_64-latest.args | 2 --
tests/qemuxml2argvdata/channel-unix-guestfwd.xml | 5 -----
.../qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args | 2 --
.../qemuxml2argvdata/console-virtio-unix.x86_64-latest.args | 2 --
tests/qemuxml2argvdata/console-virtio-unix.xml | 5 -----
tests/qemuxml2argvdata/net-vhostuser.args | 3 ---
tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args | 2 --
tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args | 2 --
tests/qemuxml2argvdata/net-vhostuser.xml | 6 ------
.../parallel-unix-chardev.x86_64-2.5.0.args | 2 --
.../parallel-unix-chardev.x86_64-latest.args | 2 --
tests/qemuxml2argvdata/parallel-unix-chardev.xml | 5 -----
tests/qemuxml2xmloutdata/net-vhostuser.xml | 6 ------
14 files changed, 46 deletions(-)
diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
index f0e718e4a2..e8776ca24e 100644
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
@@ -23,8 +23,6 @@ server,nowait \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,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 \
-chardev socket,id=charchannel0,path=/tmp/guestfwd-listen.socket,server,nowait \
-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \
-chardev socket,id=charchannel1,path=/tmp/guestfwd-connect.socket \
diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
index f9b9ee5fdb..db14217c1b 100644
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
@@ -24,8 +24,6 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,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 \
-chardev socket,id=charchannel0,fd=1729,server,nowait \
-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=user-channel0 \
-chardev socket,id=charchannel1,path=/tmp/guestfwd-connect.socket \
diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.xml b/tests/qemuxml2argvdata/channel-unix-guestfwd.xml
index c9698a1259..01c9a24ff0 100644
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.xml
+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.xml
@@ -14,11 +14,6 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</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>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
index 425bdc5d12..5c37b1903e 100644
--- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
@@ -24,8 +24,6 @@ server,nowait \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
--drive file=/dev/HostVG/QEMUGuest1,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 \
-chardev socket,id=charconsole0,path=/tmp/listen.socket,server,nowait \
-device virtconsole,chardev=charconsole0,id=console0 \
-chardev socket,id=charconsole1,path=/tmp/connect.socket \
diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
index 193d4b1295..0749b888b6 100644
--- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
@@ -25,8 +25,6 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
--drive file=/dev/HostVG/QEMUGuest1,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 \
-chardev socket,id=charconsole0,fd=1729,server,nowait \
-device virtconsole,chardev=charconsole0,id=console0 \
-chardev socket,id=charconsole1,path=/tmp/connect.socket \
diff --git a/tests/qemuxml2argvdata/console-virtio-unix.xml b/tests/qemuxml2argvdata/console-virtio-unix.xml
index 941e5a4a8a..1e11960c26 100644
--- a/tests/qemuxml2argvdata/console-virtio-unix.xml
+++ b/tests/qemuxml2argvdata/console-virtio-unix.xml
@@ -14,11 +14,6 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</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>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<console type='unix'>
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args
index 1b35a61e27..516cb23123 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -20,9 +20,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\
-bootindex=1 \
-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
-netdev vhost-user,chardev=charnet0,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\
diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
index 677a3c9e49..8f67b14a2b 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
@@ -23,8 +23,6 @@ server,nowait \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,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 \
-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
-netdev vhost-user,chardev=charnet0,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\
diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
index 7dee2bdf58..d96d8ca3a6 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
@@ -24,8 +24,6 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,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 \
-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
-netdev vhost-user,chardev=charnet0,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\
diff --git a/tests/qemuxml2argvdata/net-vhostuser.xml b/tests/qemuxml2argvdata/net-vhostuser.xml
index 917d67b9eb..1c491549b6 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.xml
+++ b/tests/qemuxml2argvdata/net-vhostuser.xml
@@ -14,12 +14,6 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
index d7d55ac611..eb504a7210 100644
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
@@ -23,8 +23,6 @@ server,nowait \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,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 \
-chardev socket,id=charparallel0,path=/tmp/parport0.socket,server,nowait \
-device isa-parallel,chardev=charparallel0,id=parallel0 \
-chardev socket,id=charparallel1,path=/tmp/parport1.socket \
diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
index 94841ea8c0..e3fa87c503 100644
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
@@ -24,8 +24,6 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,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 \
-chardev socket,id=charparallel0,fd=1729,server,nowait \
-device isa-parallel,chardev=charparallel0,id=parallel0 \
-chardev socket,id=charparallel1,path=/tmp/parport1.socket \
diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.xml b/tests/qemuxml2argvdata/parallel-unix-chardev.xml
index d4fe94779e..2d0bae3589 100644
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.xml
+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.xml
@@ -14,11 +14,6 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</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>
<controller type='ide' index='0'/>
<parallel type='unix'>
<source mode='bind' path='/tmp/parport0.socket'/>
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.xml b/tests/qemuxml2xmloutdata/net-vhostuser.xml
index b7f1bdc57f..9655c21ede 100644
--- a/tests/qemuxml2xmloutdata/net-vhostuser.xml
+++ b/tests/qemuxml2xmloutdata/net-vhostuser.xml
@@ -14,12 +14,6 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i686</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
--
2.19.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
