[libvirt] [PATCH v2 5/7] tests: qemuxml2argv: Test formatting of 'write-cache' parameter

[Ján Tomko]

On Wed, Apr 18, 2018 at 11:38:45AM +0200, Peter Krempa wrote:
>Signed-off-by: Peter Krempa <pkrempa at redhat.com>
>---
> .../disk-drive-write-cache.new.args                | 43 +++++++++++++++++++++
> tests/qemuxml2argvdata/disk-drive-write-cache.xml  | 45 ++++++++++++++++++++++
> tests/qemuxml2argvtest.c                           |  1 +
> 3 files changed, 89 insertions(+)
> create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.new.args
> create mode 100644 tests/qemuxml2argvdata/disk-drive-write-cache.xml
>
>diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.new.args b/tests/qemuxml2argvdata/disk-drive-write-cache.new.args
>new file mode 100644
>index 0000000000..90414a100f
>--- /dev/null
>+++ b/tests/qemuxml2argvdata/disk-drive-write-cache.new.args
>@@ -0,0 +1,43 @@
>+LC_ALL=C \
>+PATH=/bin \
>+HOME=/home/test \
>+USER=test \
>+LOGNAME=test \
>+QEMU_AUDIO_DRV=none \
>+/usr/bin/qemu-system-i686 \
>+-name guest=QEMUGuest1,debug-threads=on \
>+-S \
>+-object secret,id=masterKey0,format=raw,\
>+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
>+-machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
>+-m 214 \
>+-realtime mlock=off \
>+-smp 1,sockets=1,cores=1,threads=1 \
>+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
>+-display none \
>+-no-user-config \
>+-nodefaults \
>+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
>+server,nowait \
>+-mon chardev=charmonitor,id=monitor,mode=control \
>+-rtc base=utc \
>+-no-shutdown \
>+-no-acpi \
>+-boot strict=on \
>+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
>+-device lsi,id=scsi0,bus=pci.0,addr=0x2 \
>+-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
>+cache=writeback \
>+-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
>+-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,\
>+cache=none \
>+-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \
>+-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-virtio-disk0,\
>+cache=writethrough \
>+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\
>+id=virtio-disk0 \
>+-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-usb-disk1,\
>+cache=directsync \
>+-device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk1,id=usb-disk1,\
>+removable=off \
>+-msg timestamp=on
>diff --git a/tests/qemuxml2argvdata/disk-drive-write-cache.xml b/tests/qemuxml2argvdata/disk-drive-write-cache.xml
>new file mode 100644
>index 0000000000..dc7bdd6050
>--- /dev/null
>+++ b/tests/qemuxml2argvdata/disk-drive-write-cache.xml
>@@ -0,0 +1,45 @@
>+<domain type='qemu'>
>+  <name>QEMUGuest1</name>
>+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
>+  <memory unit='KiB'>219136</memory>
>+  <currentMemory unit='KiB'>219136</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-i686</emulator>
>+    <disk type='block' device='disk'>
>+      <driver name='qemu' type='qcow2' cache='writeback'/>
>+      <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='disk'>
>+      <driver name='qemu' type='qcow2' cache='none'/>
>+      <source dev='/dev/HostVG/QEMUGuest1'/>
>+      <target dev='sda' bus='scsi'/>
>+    </disk>
>+    <disk type='block' device='disk'>
>+      <driver name='qemu' type='qcow2' cache='writethrough'/>
>+      <source dev='/dev/HostVG/QEMUGuest1'/>
>+      <target dev='vda' bus='virtio'/>
>+    </disk>
>+    <disk type='block' device='disk'>
>+      <driver name='qemu' type='qcow2' cache='directsync'/>
>+      <source dev='/dev/HostVG/QEMUGuest1'/>
>+      <target dev='sdb' bus='usb'/>
>+    </disk>
>+    <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'/>
>+    <memballoon model='none'/>
>+  </devices>
>+</domain>
>diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
>index 75a9d0b908..2fa020675f 100644
>--- a/tests/qemuxml2argvtest.c
>+++ b/tests/qemuxml2argvtest.c
>@@ -1015,6 +1015,7 @@ mymain(void)
>     DO_TEST("disk-drive-cache-v2-none", NONE);
>     DO_TEST("disk-drive-cache-directsync", NONE);
>     DO_TEST("disk-drive-cache-unsafe", NONE);
>+    DO_TEST_CAPS_NEW("disk-drive-write-cache");

DO_TEST_VER with the earliest supported version would be IMO more beneficial.
DO_TEST_CAPS_NEW might be nice to have.

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
>     DO_TEST("disk-drive-network-nbd", NONE);
>     DO_TEST("disk-drive-network-nbd-export", NONE);
>     DO_TEST("disk-drive-network-nbd-ipv6", NONE);
>-- 
>2.16.2
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20180418/f13b2d81/attachment-0001.sig>