[libvirt] [PATCH v3 1/4] tests: qemuxml2argv: Use scsi controller instead of ide in pseries
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.
Signed-off-by: Lin Ma <lma(a)suse.com>
---
tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
index 72a4183..44b5751 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot c \
-usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \
+-hda /dev/HostVG/QEMUGuest1 \
-drive file=/dev/fd0,format=raw,if=floppy,unit=0 \
-drive file=/tmp/firmware.img,format=raw,if=floppy,unit=1 \
-net none \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.xml
b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.xml
index be0ede6..df82cfd 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.xml
@@ -17,7 +17,7 @@
<disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
+ <target dev='hda' bus='scsi'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
<disk type='block' device='floppy'>
@@ -34,7 +34,7 @@
</disk>
<controller type='usb' index='0'/>
<controller type='fdc' index='0'/>
- <controller type='ide' index='0'/>
+ <controller type='scsi' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='none'/>
</devices>
--
2.9.2