From nobody Mon Feb 9 10:39:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1657199520; cv=none; d=zohomail.com; s=zohoarc; b=CzyVhF5e0y34CVWpsnvMQo6llbcDmvErquLBGJ9wud7OrdJmX3l7ABhRNUxVlDqWcKhuBuzRyMoQrruUrAyIp3FCPFWZv2bnmcmo+KagZ4YXGAlTtJTTPIkwtfzBMjZ5MD8GKHMNKT2JsUA9OV0chldH0HaLpJYWYWe5rfv9Elg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657199520; 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=WMCuYD6Puenc+YSzk0k4njnJw/BT/PS7W3HfIxtOwUM=; b=FlydLAjAQijd36YJzKS4eHtVKPZA/1l1IezwRdpHQtonKjqWIfoRlnIZ75aH+okHhsS8w2uMyLvP4iMQLFSw7ZKcuDxseUl5/3/bUpRgHPzwUaYxeZsiPApq706+BPD5Awf52HNEkSzhx2S9zCAq0x5CjoFugynrOsPP2G8nXRM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1657199520860724.4906676699543; Thu, 7 Jul 2022 06:12:00 -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-240-olR5Mk1EOlelmfTjuhJn0A-1; Thu, 07 Jul 2022 09:11:49 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2CC20108C09D; Thu, 7 Jul 2022 13:11:07 +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 187B12166B26; Thu, 7 Jul 2022 13:11:07 +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 356341947B92; Thu, 7 Jul 2022 13:10:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 76E1A1947B8F for ; Thu, 7 Jul 2022 13:10:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5963A40315A; Thu, 7 Jul 2022 13:10:52 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA11C492C3B for ; Thu, 7 Jul 2022 13:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657199519; 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=WMCuYD6Puenc+YSzk0k4njnJw/BT/PS7W3HfIxtOwUM=; b=E19jcXQlh4OOwSe3R+3y2NO/4gNTDuHnXPy308OKGavX8+g8FfgbewxyxmeZf7P/X3HM+z kXgs74i15iGazwmwvad3czd4PBhZB0/sYDx+Vq1Cu2LFMZSueMVTpoNIxUqLfO7/zCkVik ObiCPyA2/K0s6EwLPsDEnDyaWlLbsJQ= X-MC-Unique: olR5Mk1EOlelmfTjuhJn0A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/11] qemuxml2argvtest: Convert 'cpu-eoi-(disabled|enabled)' cases to VIR_TEST_CAPS_LATEST Date: Thu, 7 Jul 2022 15:10:38 +0200 Message-Id: <1e3fa25d71067fb8f043133a65733a9a9a00553a.1657199364.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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 2.78 on 10.11.54.6 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1657199523260100001 Content-Type: text/plain; charset="utf-8" The tested feature doesn't change across versions so we can use the modern testing infrastructure. Signed-off-by: Peter Krempa --- ...ed.args =3D> cpu-eoi-disabled.x86_64-latest.args} | 14 ++++++++------ tests/qemuxml2argvdata/cpu-eoi-disabled.xml | 2 +- ...led.args =3D> cpu-eoi-enabled.x86_64-latest.args} | 14 ++++++++------ tests/qemuxml2argvdata/cpu-eoi-enabled.xml | 2 +- tests/qemuxml2argvtest.c | 6 ++++-- tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml | 2 +- tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml | 2 +- 7 files changed, 24 insertions(+), 18 deletions(-) rename tests/qemuxml2argvdata/{cpu-eoi-disabled.args =3D> cpu-eoi-disabled= .x86_64-latest.args} (53%) rename tests/qemuxml2argvdata/{cpu-eoi-enabled.args =3D> cpu-eoi-enabled.x= 86_64-latest.args} (53%) diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2a= rgvdata/cpu-eoi-disabled.x86_64-latest.args similarity index 53% rename from tests/qemuxml2argvdata/cpu-eoi-disabled.args rename to tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args index b252446464..dfb4a53bfd 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args +++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args @@ -6,15 +6,15 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ -cpu qemu32,kvm-pv-eoi=3Doff \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -26,6 +26,8 @@ QEMU_AUDIO_DRV=3Dnone \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-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/cpu-eoi-disabled.xml b/tests/qemuxml2ar= gvdata/cpu-eoi-disabled.xml index 657de0482a..c93e75e3e5 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml +++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml @@ -21,7 +21,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2ar= gvdata/cpu-eoi-enabled.x86_64-latest.args similarity index 53% rename from tests/qemuxml2argvdata/cpu-eoi-enabled.args rename to tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args index 849593269d..155d5ecef7 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args +++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args @@ -6,15 +6,15 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-i386 \ +/usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ -cpu qemu32,kvm-pv-eoi=3Don \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -26,6 +26,8 @@ QEMU_AUDIO_DRV=3Dnone \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-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/cpu-eoi-enabled.xml b/tests/qemuxml2arg= vdata/cpu-eoi-enabled.xml index bc8934f260..1c24398f42 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml +++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml @@ -21,7 +21,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index bdfb47f0e5..17d7ee9ab0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1247,8 +1247,6 @@ mymain(void) DO_TEST_CAPS_LATEST("controller-usb-order"); - DO_TEST_NOCAPS("cpu-eoi-disabled"); - DO_TEST_NOCAPS("cpu-eoi-enabled"); DO_TEST("controller-order", QEMU_CAPS_KVM, QEMU_CAPS_PIIX3_USB_UHCI, @@ -1258,6 +1256,10 @@ mymain(void) QEMU_CAPS_USB_HUB, QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_DEVICE_CIRRUS_VGA); + /* 'eoi' cpu feature with an explicit CPU defined */ + DO_TEST_CAPS_LATEST("cpu-eoi-disabled"); + DO_TEST_CAPS_LATEST("cpu-eoi-enabled"); + /* 'eoi' cpu feature without an explicit CPU defined */ DO_TEST_CAPS_VER("eoi-disabled", "4.0.0"); DO_TEST_CAPS_LATEST("eoi-disabled"); DO_TEST_CAPS_VER("eoi-enabled", "4.0.0"); diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml b/tests/qemuxml2= xmloutdata/cpu-eoi-disabled.xml index 7ae2c7034b..acd17da598 100644 --- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml +++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml @@ -21,7 +21,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml b/tests/qemuxml2x= mloutdata/cpu-eoi-enabled.xml index bee4fd0240..49900aea9a 100644 --- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml +++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml @@ -21,7 +21,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
--=20 2.36.1