From: Lin Ma <lma@suse.com>
Date: Fri, 1 Dec 2017 11:31:29 +0000 (+0800)
Subject: tests: Remove use of IDE disk for pseries floppy test
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bdd15d471ae934cb14c00074b8532e14b29efa77;p=libvirt.git

tests: Remove use of IDE disk for pseries floppy test

Adding an IDE controller for a machinetype that has no built-in IDE
controller, libvirt will log an error. Currently the machinetype list
which returns by qemuDomainMachineHasBuiltinIDE only includes 440fx,
malta, sun4u and g3beige.

Remove the disk and the .args file since the expectation is the test
will fail in qemuxml2argvtest because floppy is not supported on pseries
and thus no disk is necessary and no .args file would be created to
compare against.

Signed-off-by: Lin Ma <lma@suse.com>
Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/tests/qemuxml2argvdata/disk-floppy-pseries.args b/tests/qemuxml2argvdata/disk-floppy-pseries.args
deleted file mode 100644
index 72a4183024..0000000000
--- a/tests/qemuxml2argvdata/disk-floppy-pseries.args
+++ /dev/null
@@ -1,24 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-ppc64 \
--name QEMUGuest1 \
--S \
--M pseries \
--m 214 \
--smp 1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--monitor unix:/tmp/test-monitor,server,nowait \
--no-acpi \
--boot c \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
--drive file=/dev/fd0,format=raw,if=floppy,unit=0 \
--drive file=/tmp/firmware.img,format=raw,if=floppy,unit=1 \
--net none \
--serial none \
--parallel none
diff --git a/tests/qemuxml2argvdata/disk-floppy-pseries.xml b/tests/qemuxml2argvdata/disk-floppy-pseries.xml
index be0ede6bdd..a4191abe19 100644
--- a/tests/qemuxml2argvdata/disk-floppy-pseries.xml
+++ b/tests/qemuxml2argvdata/disk-floppy-pseries.xml
@@ -14,12 +14,6 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</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>
     <disk type='block' device='floppy'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/fd0'/>
@@ -34,7 +28,6 @@
     </disk>
     <controller type='usb' index='0'/>
     <controller type='fdc' index='0'/>
-    <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <memballoon model='none'/>
   </devices>