From nobody Fri Oct 18 08:40:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693923952; cv=none; d=zohomail.com; s=zohoarc; b=JTwkrU8ZQqiuB7I2dYxhweVjr6p0ZmvtiCTLzAC9209Qn2UXap2YpnO9wEVYKHoZwAwu+qTjSN8QlOs9j3fYCDZdyXV5VuSfSh9E9t6qYDn7pkZKY2vNG5OR9ddY6sJR57IOhc6kQOCIh1ThbpjGT+x/4T/ozL8aMaEcoFfAe+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923952; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OiZWLC5XY93sRiEOYcnzKDwlgiixofE/DQf81tRTBJw=; b=flfOANTppaS4d2p+ZBMR3sj+Ms80WSQ1Q7EpTikyEVc1kd8GprFPfReX64Ix3tH77viq4qNYKJmr1j7UAkDI0YexdQNnevrZAIfIXQYJKzxrM3RoqZ/UckB9IoLrOJWInflYhe0HUGl/zzTq67kSh3sjm7+JnIfdXt49dd9xv8Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1693923952597299.1080805406357; Tue, 5 Sep 2023 07:25:52 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-581-CZY1s-kSMZSusfwmhnPMlQ-1; Tue, 05 Sep 2023 10:25:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A730182EFBD; Tue, 5 Sep 2023 14:25:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC2D6412F2CD; Tue, 5 Sep 2023 14:25:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D84A519465B7; Tue, 5 Sep 2023 14:25:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 869FB19465A2 for ; Tue, 5 Sep 2023 14:25:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 64A2C1121318; Tue, 5 Sep 2023 14:25:01 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B49DD1121314 for ; Tue, 5 Sep 2023 14:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923951; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=OiZWLC5XY93sRiEOYcnzKDwlgiixofE/DQf81tRTBJw=; b=Ngai3C7DdhmYKP5H2rXVaZlkfBmbjxDlQyukLRiPLithgo44uq1H8FN7ne0EcvxZ1l2BlR dS4V1XxfTfHkmhzVfh5k0UlxEGv6x+OnMqElf1w+bo5V2IsEGkExPzrQNs7kSb8j/B2ZRe MdmeiQzTkNpZRi3JJc6GPZeWIqfepJI= X-MC-Unique: CZY1s-kSMZSusfwmhnPMlQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 35/51] qemuxml2argvtest: Properly modernize 'clock-hpet-off' test case Date: Tue, 5 Sep 2023 16:24:02 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693923955726100001 Content-Type: text/plain; charset="utf-8" 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 --- .../clock-hpet-off.x86_64-7.2.0.args | 39 +++++++++++++++++++ ...args =3D> 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 =3D> clock-hpet-off.x86= _64-latest.args} (93%) diff --git a/tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args b/test= s/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=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-7.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc= .ram \ +-accel tcg \ +-cpu qemu64 \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc,driftfix=3Dslew \ +-global kvm-pit.lost_tick_policy=3Ddelay \ +-no-hpet \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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-form= at","id":"ide0-0-0","bootindex":1}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2arg= vdata/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=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi= =3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,hpet= =3Doff,acpi=3Doff \ -accel tcg \ -cpu qemu64 \ -m size=3D219136k \ @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ --no-hpet \ +-global kvm-pit.lost_tick_policy=3Ddelay \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ 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"); --=20 2.41.0