From nobody Mon Sep 16 19:49:07 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=1693924025; cv=none; d=zohomail.com; s=zohoarc; b=Uch/f8DTgSJNQxWghdY0Kc0QQ4OUtiGg7kbDtGJbrSEFvQt5RpOnxgYkHCF79IMN1JhfNjlmFvNS/NylE+PQOoPbwgdOzlhfLBlR4C5ir3AES27U3UEP1KTG51XASjJiyzbuwg6V04+lb24JPC1yGm2K5OcctdS2hX3gn2Q88AE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693924025; 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=FBms3MdOtpA45lYOz0wQ18omoU25ZM3t0bReCH5PVuY=; b=QWworz71dq2FFs92lMKlvtMgOJ4xkgZiABfkeItdHboq4X1iNgfXsB2IzFQ6D/o6gF39RCjh0kn6cSCkkYLitx7d7PTzCHH73flcETQhgt4mDXAYWMsdEh53yaTK2XK+fvu/MWzmkS/iw/BKbURwOb8gF18jdWwkpv1Ddh3yLnE= 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 1693924025456652.9406136338033; Tue, 5 Sep 2023 07:27:05 -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-680-z13Ua8P9N-iqb55I1Sjgag-1; Tue, 05 Sep 2023 10:25:56 -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 925711042B52; Tue, 5 Sep 2023 14:25:10 +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 8046540C84A7; Tue, 5 Sep 2023 14:25:10 +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 6FFAB1946595; Tue, 5 Sep 2023 14:25:10 +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 C4D5A19465B1 for ; Tue, 5 Sep 2023 14:25:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B44331121318; Tue, 5 Sep 2023 14:25:08 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 321CD1121314 for ; Tue, 5 Sep 2023 14:25:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693924024; 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=FBms3MdOtpA45lYOz0wQ18omoU25ZM3t0bReCH5PVuY=; b=ifr5eLCHyN0Lip8Z0kwMjMI7LOCmMohvdxS2FGoKPQWNnkepDNeZOr+cW1myNTgbva54WP IQMAfBfPNPP5z2Ufaf/937Gse2zyL570SGbRncIPdHSIqSmw5w7fLuVZV+tXvyXnRJ6cWt 88km9wB+ANfxvN2jS0NLsPMcw704NJQ= X-MC-Unique: z13Ua8P9N-iqb55I1Sjgag-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 43/51] qemuxml2argvtest: Modernize 'cpu-exact' cases Date: Tue, 5 Sep 2023 16:24:10 +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.1 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: 1693924026846100001 Content-Type: text/plain; charset="utf-8" Use real capabilities, but select the fake 'Haswell' host CPU for test stability. Signed-off-by: Peter Krempa --- .../{cpu-exact1.args =3D> cpu-exact1.x86_64-latest.args} | 0 ...back.args =3D> cpu-exact2-nofallback.x86_64-latest.args} | 0 .../{cpu-exact2.args =3D> cpu-exact2.x86_64-latest.args} | 0 ...es.args =3D> cpu-no-removed-features.x86_64-latest.args} | 0 tests/qemuxml2argvtest.c | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename tests/qemuxml2argvdata/{cpu-exact1.args =3D> cpu-exact1.x86_64-late= st.args} (100%) rename tests/qemuxml2argvdata/{cpu-exact2-nofallback.args =3D> cpu-exact2-= nofallback.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-exact2.args =3D> cpu-exact2.x86_64-late= st.args} (100%) rename tests/qemuxml2argvdata/{cpu-no-removed-features.args =3D> cpu-no-re= moved-features.x86_64-latest.args} (100%) diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdat= a/cpu-exact1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact1.args rename to tests/qemuxml2argvdata/cpu-exact1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemu= xml2argvdata/cpu-exact2-nofallback.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact2-nofallback.args rename to tests/qemuxml2argvdata/cpu-exact2-nofallback.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdat= a/cpu-exact2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact2.args rename to tests/qemuxml2argvdata/cpu-exact2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qe= muxml2argvdata/cpu-no-removed-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-no-removed-features.args rename to tests/qemuxml2argvdata/cpu-no-removed-features.x86_64-latest.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6997d7400c..cea936518e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1739,11 +1739,11 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum1", "x86_64", ARG_CAPS_HOST_= CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum2", "x86_64", ARG_CAPS_HOST_= CPU_MODEL, QEMU_CPU_DEF_HASWELL); - DO_TEST("cpu-exact1", QEMU_CAPS_KVM); - DO_TEST("cpu-exact2", QEMU_CAPS_KVM); - DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact1", "x86_64", ARG_CAPS_HOST_CP= U_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact2", "x86_64", ARG_CAPS_HOST_CP= U_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact2-nofallback", "x86_64", ARG_C= APS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); 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_CAPS_ARCH_LATEST_FULL("cpu-no-removed-features", "x86_64", ARG= _CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); /* EPYC-Milan became available in qemu-6.0, use it for the fallback te= sts */ DO_TEST_CAPS_VER_FAILURE("cpu-nofallback", "5.2.0"); --=20 2.41.0