From 035b9bde6aa42ef31a7cd54e94dcf2a4f2c9071f Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 4 Sep 2023 15:49:50 +0200 Subject: [PATCH] qemuxml2argvtest: Properly modernize 'clock-hpet-off' test case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since qemu-8.0 a new way to disable 'hpet' via -machine was added. Properly test both branches with real capabilities. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- .../clock-hpet-off.x86_64-7.2.0.args | 39 +++++++++++++++++++ ...args => clock-hpet-off.x86_64-latest.args} | 4 +- tests/qemuxml2argvtest.c | 3 +- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args rename tests/qemuxml2argvdata/{clock-hpet-off.args => clock-hpet-off.x86_64-latest.args} (93%) diff --git a/tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args b/tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args new file mode 100644 index 0000000000..47bff8d51c --- /dev/null +++ b/tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=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,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc,driftfix=slew \ +-global kvm-pit.lost_tick_policy=delay \ +-no-hpet \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args similarity index 93% rename from tests/qemuxml2argvdata/clock-hpet-off.args rename to tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args index f0869f45b7..bbaae52aff 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,hpet=off,acpi=off \ -accel tcg \ -cpu qemu64 \ -m size=219136k \ @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc,driftfix=slew \ --no-hpet \ +-global kvm-pit.lost_tick_policy=delay \ -no-shutdown \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 03c426e34e..bfb116e45d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1107,7 +1107,8 @@ mymain(void) DO_TEST_NOCAPS("clock-localtime-basis-localtime"); DO_TEST_NOCAPS("clock-variable"); DO_TEST_NOCAPS("clock-france"); - DO_TEST_NOCAPS("clock-hpet-off"); + DO_TEST_CAPS_VER("clock-hpet-off", "7.2.0"); + DO_TEST_CAPS_LATEST("clock-hpet-off"); DO_TEST("clock-catchup", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST_NOCAPS("cpu-kvmclock"); DO_TEST_NOCAPS("cpu-host-kvmclock");