11:18 a.m.
---
.../qemuxml2argv-disk-scsi-device.xml | 2 +-
.../qemuxml2argv-pseries-vio-user-assigned.args | 10 +++++++++-
.../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 10 +++++++++-
.../qemuxml2xmlout-disk-scsi-device-auto.xml | 2 +-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml
b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml
index 17b59d8..9456335 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml
@@ -26,7 +26,7 @@
</disk>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
- <controller type='scsi' index='0'/>
+ <controller type='scsi' index='0' model='lsilogic'/>
<memballoon model='virtio'/>
</devices>
</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
index e939e1b..aed9ca8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
@@ -1 +1,9 @@
-LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 -S
-M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults -chardev
socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon
chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device
spapr-vscsi,id=scsi0,reg=0x2000 -device spapr-vscsi,id=scsi1,reg=0x30000000 -drive
file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0 -device
scsi-disk,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0 -chardev
pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x20000000 -chardev
pty,id=charserial1 -device spapr-vty,chardev=charserial1,reg=0x30001000 -usb
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 \
+-S -M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \
+-device spapr-vscsi,id=scsi0,reg=0x2000 -device spapr-vscsi,id=scsi1,reg=0x30000000 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \
+-device
scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0 \
+-chardev pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x20000000 \
+-chardev pty,id=charserial1 -device spapr-vty,chardev=charserial1,reg=0x30001000 -usb
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
index 5fe0c88..c5bef9f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
@@ -1 +1,9 @@
-LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 -S
-M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults -chardev
socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon
chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device
spapr-vscsi,id=scsi0,reg=0x2000 -device spapr-vscsi,id=scsi1,reg=0x3000 -drive
file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0 -device
scsi-disk,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,id=scsi1-0-0 -chardev
pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x30000000 -chardev
pty,id=charserial1 -device spapr-vty,chardev=charserial1,reg=0x30001000 -usb
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 \
+-S -M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \
+-device spapr-vscsi,id=scsi0,reg=0x2000 -device spapr-vscsi,id=scsi1,reg=0x3000 \
+-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \
+-device
scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0 \
+-chardev pty,id=charserial0 -device spapr-vty,chardev=charserial0,reg=0x30000000 \
+-chardev pty,id=charserial1 -device spapr-vty,chardev=charserial1,reg=0x30001000 -usb
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml
index 17b59d8..9456335 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml
@@ -26,7 +26,7 @@
</disk>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
- <controller type='scsi' index='0'/>
+ <controller type='scsi' index='0' model='lsilogic'/>
<memballoon model='virtio'/>
</devices>
</domain>
--
1.7.7.3