On 12/09/2016 09:28 AM, Maxim Nestratov wrote:
> As specifying both QEMU_CAPS_NO_KVM_PIT and QEMU_CAPS_KVM_PIT_TICK_POLICY
> capabilities has no practical sense in tests, and we already have tests
> for QEMU_CAPS_KVM_PIT_TICK_POLICY, it's better to add a separate one with
> QEMU_CAPS_NO_KVM_PIT set.
My suggested alteration:
tests: Add "no-kvm-pit-device" testcase
Add a test case for when the QEMU_CAPS_NO_KVM_PIT capability is set.
This capability is mutually exclusive to QEMU_CAPS_KVM_PIT_TICK_POLICY
and results in the same output regardless of whether "discard" or
"delay" was specified in the guest XML for 'tickpolicy'.
ACK -
John
>
> Signed-off-by: Maxim Nestratov <mnestratov@xxxxxxxxxxxxx>
> ---
> .../qemuxml2argv-no-kvm-pit-device.args | 23 +++++++++++++++++
> .../qemuxml2argv-no-kvm-pit-device.xml | 29 ++++++++++++++++++++++
> tests/qemuxml2argvtest.c | 1 +
> 3 files changed, 53 insertions(+)
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.args
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.xml
>
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.args b/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.args
> new file mode 100644
> index 0000000..1d69797
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.args
> @@ -0,0 +1,23 @@
> +LC_ALL=C \
> +PATH=/bin \
> +HOME=/home/test \
> +USER=test \
> +LOGNAME=test \
> +QEMU_AUDIO_DRV=none \
> +/usr/bin/qemu \
> +-name QEMUGuest1 \
> +-S \
> +-M pc \
> +-m 214 \
> +-smp 2,sockets=2,cores=1,threads=1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-nographic \
> +-nodefaults \
> +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
> +-no-kvm-pit-reinjection \
> +-no-acpi \
> +-boot c \
> +-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 \
> +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.xml
> new file mode 100644
> index 0000000..d8ddcba
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.xml
> @@ -0,0 +1,29 @@
> +<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'>2</vcpu>
> + <os>
> + <type arch='i686' machine='pc'>hvm</type>
> + <boot dev='hd'/>
> + </os>
> + <clock offset='utc'>
> + <timer name='pit' tickpolicy='discard'/>
> + </clock>
> + <on_poweroff>destroy</on_poweroff>
> + <on_reboot>restart</on_reboot>
> + <on_crash>destroy</on_crash>
> + <devices>
> + <emulator>/usr/bin/qemu</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'/>
> + <memballoon model='virtio'/>
> + </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 713a8fe..77af591 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -2061,6 +2061,7 @@ mymain(void)
>
> DO_TEST("kvm-pit-delay", QEMU_CAPS_KVM_PIT_TICK_POLICY);
> DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY);
> + DO_TEST("no-kvm-pit-device", QEMU_CAPS_NO_KVM_PIT);
>
> DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC,
> QEMU_CAPS_NODEFCONFIG);
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
