From nobody Mon Feb 9 10:32:16 2026 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=1657885480; cv=none; d=zohomail.com; s=zohoarc; b=AVhNY7PtCumJGpE0MEzkHZUvyWQCVy9++ZVB5HJVjv4MMMRUGVne7hWEN8HERYuaRANR0E7hWKjYZkr8VGDEbwU1MEzWAALARy/nppJQmckIXzKuutmOPxVOhs6Mbk6BdQDgEF6ShJWDoBpt3WdPf2HuRLRssUvDYWuvJtbD0mE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657885480; 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=65H5mbRK4K6SHOGxIFYJRIq2QghSF0qElmzKC0JoW1k=; b=NzW5MMWZA8+TdoAEKOliLWkURP5vnnTta1WyuXzgdmkFKc5XyJD2QApss1vCIJ0/QZjlRsm+LYuwboaUttKkeoV+OSgg3Pp04I17Q2cCkwZkM9dzzLlv+rdXg4zIIIhIlbq5/bWRiYvQKWVGHzAh2z7pL+gOC0ORk4bY/5JeV3w= 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 1657885480799643.3315810633536; Fri, 15 Jul 2022 04:44:40 -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-97-yzoZ3_KjOGKA_HwyDb9kPA-1; Fri, 15 Jul 2022 07:44:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 49140187506E; Fri, 15 Jul 2022 11:44:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0006B404C6C8; Fri, 15 Jul 2022 11:44:33 +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 D66BE1947041; Fri, 15 Jul 2022 11:44:33 +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 549DD1947B81 for ; Fri, 15 Jul 2022 11:44:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 435A0403162; Fri, 15 Jul 2022 11:44:31 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD393492C3B for ; Fri, 15 Jul 2022 11:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657885479; 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=65H5mbRK4K6SHOGxIFYJRIq2QghSF0qElmzKC0JoW1k=; b=FTf6wYemmU1c6metcnbB84pqTELCbvX2rjDk9nhytStWdoELMDZfssVzkIuTRL08JvArA/ /rbs0YvU1eafcP9PsH0ycB7AC8is8WtneNeSkZuamoKhy2c/v0b7u6xBimqtV81Imv0Lck F3akaTfurk4R0FF97OHknHuICDRNAKU= X-MC-Unique: yzoZ3_KjOGKA_HwyDb9kPA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/20] qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model' test Date: Fri, 15 Jul 2022 13:44:10 +0200 Message-Id: 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.84 on 10.11.54.1 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: 1657885481970100002 Content-Type: text/plain; charset="utf-8" Minimum qemu will be bumped to 4.2 so remove the older test cases. Signed-off-by: Peter Krempa --- .../cpu-host-model.x86_64-3.1.0.args | 36 ------------------- .../cpu-host-model.x86_64-4.0.0.args | 36 ------------------- .../cpu-host-model.x86_64-4.1.0.args | 36 ------------------- tests/qemuxml2argvtest.c | 3 -- 4 files changed, 111 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args deleted file mode 100644 index f7e48be757..0000000000 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -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-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-q35-3.1,usb=3Doff,dump-guest-core=3Doff \ --accel kvm \ --cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,xsaves=3Don,pdpe1gb=3Don \ --m 214 \ --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 \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args deleted file mode 100644 index 4c7fcf8a31..0000000000 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -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-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-q35-4.0,usb=3Doff,dump-guest-core=3Doff \ --accel kvm \ --cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don \ --m 214 \ --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 \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args deleted file mode 100644 index 8e126568d0..0000000000 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args +++ /dev/null @@ -1,36 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -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-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-q35-4.1,usb=3Doff,dump-guest-core=3Doff \ --accel kvm \ --cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,= clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s= sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don \ --m 214 \ --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 \ --no-shutdown \ --no-acpi \ --boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d65a18f8d4..3d5ded60d7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2009,9 +2009,6 @@ mymain(void) /* host-model cpu expansion depends on the cpu reported by qemu and th= us * we invoke it for all real capability dumps we have */ - DO_TEST_CAPS_VER("cpu-host-model", "3.1.0"); - DO_TEST_CAPS_VER("cpu-host-model", "4.0.0"); - DO_TEST_CAPS_VER("cpu-host-model", "4.1.0"); DO_TEST_CAPS_VER("cpu-host-model", "4.2.0"); DO_TEST_CAPS_VER("cpu-host-model", "5.0.0"); DO_TEST_CAPS_VER("cpu-host-model", "5.1.0"); --=20 2.36.1