From nobody Mon Sep 16 19:42:23 2024 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=1693924036; cv=none; d=zohomail.com; s=zohoarc; b=YujUXGbkfXhBJRbjn6kZe4p3P/gpCZHU2oHeAl3lxlriLObQDdhrvONfrMeCv9g42Ym5fYxb6PnvWsmaLWc7fnU77nZcZMjJyr/wPMTiymu6SbuUwQYkVE/ReJEtQV2Or+LxMn2jf06zD9ohL3NFIEOj5nLPJXQSBMiuhlnDSHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924036; 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=/LDAdi1x1lV6tlj5Y9+YMJMEaSWOLfDBrc1LAJhbMW0=; b=Y/LE1oBxhTKS3f7ib2ZYq0/Upho/NN04gX4GiJGt9wnHai1ZdM8mSejzci9eWqj45j67X9hUCfqA+vL/PZY3wLGvr/ZkSkUM/kQNBZpMrLVQ5UtApZg/BhJiA2e8FK8Cm8wavOUEmakH0+kCDGK5Rqr7MZLiM93QpJMlZPZidcA= 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 1693924036350136.50063098042745; Tue, 5 Sep 2023 07:27:16 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-377-SpFtcQq6OLyOsc9Vr3ICLQ-1; Tue, 05 Sep 2023 10:26:01 -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 492511C09A59; Tue, 5 Sep 2023 14:25:09 +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 35FBE412F2D0; Tue, 5 Sep 2023 14:25:09 +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 279E31946597; Tue, 5 Sep 2023 14:25:09 +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 20EFC1946A6D for ; Tue, 5 Sep 2023 14:25:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 01BA91005B8E; Tue, 5 Sep 2023 14:25:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A6201121314 for ; Tue, 5 Sep 2023 14:25:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924035; 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=/LDAdi1x1lV6tlj5Y9+YMJMEaSWOLfDBrc1LAJhbMW0=; b=Zx5la06KcaBZwEdA82ziiG0WKG+iOQELwxizNuLdoWMkErqO7FTavkBzh1W2lhMUGpho0c /Zr3Elnwrda87ckOc4/erMlWoTUdaefErYDcScgtcCpOelmcuzK7doBNYaMWoB+M0pZkrU /jxAdZ2PUmy+vZsbvSIhybdeR7rAVM0= X-MC-Unique: SpFtcQq6OLyOsc9Vr3ICLQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 41/51] qemuxml2argvtest: Modernize 'cpu-strict' case Date: Tue, 5 Sep 2023 16:24:08 +0200 Message-ID: <7aae39c3a57a3c564e83160f92590e5d24087c12.1693923601.git.pkrempa@redhat.com> 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: 1693924037283100001 Content-Type: text/plain; charset="utf-8" Use the fake Haswell processor definition and augment the list of features to make the test pass. Signed-off-by: Peter Krempa --- ...u-strict1.args =3D> cpu-strict1.x86_64-latest.args} | 2 +- tests/qemuxml2argvdata/cpu-strict1.xml | 12 +++++++++++- tests/qemuxml2argvtest.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) rename tests/qemuxml2argvdata/{cpu-strict1.args =3D> cpu-strict1.x86_64-la= test.args} (84%) diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvda= ta/cpu-strict1.x86_64-latest.args similarity index 84% rename from tests/qemuxml2argvdata/cpu-strict1.args rename to tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args index 7e33e9dd62..3f9c3516bb 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -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 \ -accel kvm \ --cpu core2duo,ds=3Don,acpi=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,vmx=3Don,est= =3Don,xtpr=3Don,3dnowext=3Don,lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pb= e=3Doff,ss=3Doff,sse4a=3Doff,wdt=3Doff \ +-cpu Haswell,ds=3Don,acpi=3Don,ht=3Don,tm=3Don,ds-cpl=3Don,vmx=3Don,est=3D= on,xtpr=3Don,3dnowext=3Don,lahf-lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pbe= =3Doff,ss=3Doff,sse4a=3Doff,wdt=3Doff,vme=3Doff,invtsc=3Doff,abm=3Doff,pdpe= 1gb=3Doff,rdrand=3Doff,f16c=3Doff,pdcm=3Doff,smx=3Doff,monitor=3Doff,dtes64= =3Doff \ -m size=3D219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-strict1.xml b/tests/qemuxml2argvdat= a/cpu-strict1.xml index f17c75b6af..63db54ecad 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.xml +++ b/tests/qemuxml2argvdata/cpu-strict1.xml @@ -9,7 +9,7 @@ - core2duo + Haswell @@ -27,6 +27,16 @@ + + + + + + + + + + destroy diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7fc564d3ef..e2af688529 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1744,7 +1744,7 @@ mymain(void) DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM); DO_TEST("cpu-fallback", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-nofallback", QEMU_CAPS_KVM); - DO_TEST("cpu-strict1", QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-strict1", "x86_64", ARG_CAPS_HOST_C= PU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST("cpu-no-removed-features", QEMU_CAPS_KVM); DO_TEST_NOCAPS("cpu-numa1"); DO_TEST_NOCAPS("cpu-numa2"); --=20 2.41.0