From nobody Mon Sep 16 19:13:26 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=1693923960; cv=none; d=zohomail.com; s=zohoarc; b=mluNh2zSztwNqhkapYP8fl87i9uqjXFPAV8wqa6go1PTjH3f4SNpWWpVc34zkrSijDjdkB2t1h8BPx6hcHF8F/pYIBctFmWqbzcE00baFDhMLGtyeaMDNFTMbWESZsSvaYq9T5lV38K4IFUd75xARVBJsvfctI6YDj536fyyLbc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923960; 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=xdgpl71Ib840fNyI4nbo+KkSOHNrscJo9iOGN0PzlgY=; b=iFAco/hwt1owQMaf/uczz0RHR8vImiOC8HP9DIaWc0szROI+zpA3Z2lWp7jUHLGT4B7JO5OozDoH06rkH4mDiJZ03w4m7aDIeqsncv09Ix4Eqnd1qoDPl4D6T5/1JYpaD8Hh+i6JI2QB85qnqsmTppKO6vYLbVHNHmASJhXa+d4= 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 1693923960876415.3695570442891; Tue, 5 Sep 2023 07:26: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-538-VX6vSnaXPG2j5dbgvN5pMQ-1; Tue, 05 Sep 2023 10:25:52 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E575B18DA749; Tue, 5 Sep 2023 14:25:06 +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 D44475CC01; Tue, 5 Sep 2023 14:25:06 +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 ADE351946595; Tue, 5 Sep 2023 14:25:06 +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 63D361946597 for ; Tue, 5 Sep 2023 14:25:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 498631121318; Tue, 5 Sep 2023 14:25:05 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC3771121314 for ; Tue, 5 Sep 2023 14:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923959; 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=xdgpl71Ib840fNyI4nbo+KkSOHNrscJo9iOGN0PzlgY=; b=KXv4r/jfF/zoigxRYXnGCiXQ1JzBlIAkO2MgiwP00rYz2tZsSBZTPnJFqtAN6AmTGMcJEc l3VIgMNTxeVYrZn300vJW7oFkOQmelcwddiOImmHdqNjL3z/k1ISr8pTZTYZZ/23LK7Meo JzfZCtIaGKkgRGld0sEHBgIK/Hesfjc= X-MC-Unique: VX6vSnaXPG2j5dbgvN5pMQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 39/51] qemuxml2argvtest: Modernize 'cpu-Haswell' test cases Date: Tue, 5 Sep 2023 16:24:06 +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.5 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: 1693923962953100001 Content-Type: text/plain; charset="utf-8" Modernize all test cases which set 'Haswell' as the host cpu model. Signed-off-by: Peter Krempa --- ...X.args =3D> cpu-Haswell-noTSX.x86_64-latest.args} | 0 ...Haswell.args =3D> cpu-Haswell.x86_64-latest.args} | 0 ...swell2.args =3D> cpu-Haswell2.x86_64-latest.args} | 0 ...swell3.args =3D> cpu-Haswell3.x86_64-latest.args} | 0 ....args =3D> cpu-host-model-cmt.x86_64-latest.args} | 0 ...y.args =3D> cpu-tsc-frequency.x86_64-latest.args} | 0 tests/qemuxml2argvtest.c | 14 ++++++-------- 7 files changed, 6 insertions(+), 8 deletions(-) rename tests/qemuxml2argvdata/{cpu-Haswell-noTSX.args =3D> cpu-Haswell-noT= SX.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-Haswell.args =3D> cpu-Haswell.x86_64-la= test.args} (100%) rename tests/qemuxml2argvdata/{cpu-Haswell2.args =3D> cpu-Haswell2.x86_64-= latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-Haswell3.args =3D> cpu-Haswell3.x86_64-= latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-cmt.args =3D> cpu-host-model= -cmt.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-tsc-frequency.args =3D> cpu-tsc-frequen= cy.x86_64-latest.args} (100%) diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2= argvdata/cpu-Haswell-noTSX.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell-noTSX.args rename to tests/qemuxml2argvdata/cpu-Haswell-noTSX.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvda= ta/cpu-Haswell.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell.args rename to tests/qemuxml2argvdata/cpu-Haswell.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvd= ata/cpu-Haswell2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell2.args rename to tests/qemuxml2argvdata/cpu-Haswell2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvd= ata/cpu-Haswell3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell3.args rename to tests/qemuxml2argvdata/cpu-Haswell3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml= 2argvdata/cpu-host-model-cmt.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-cmt.args rename to tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2= argvdata/cpu-tsc-frequency.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-tsc-frequency.args rename to tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-latest.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 050d38c3fc..a3e137e1c1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1805,14 +1805,12 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("cpu-s390-zEC12", "s390x"); DO_TEST_CAPS_ARCH_LATEST("cpu-s390-features", "s390x"); - qemuTestSetHostCPU(&driver, driver.hostarch, qemuTestGetCPUDef(QEMU_CP= U_DEF_HASWELL)); - DO_TEST("cpu-Haswell", QEMU_CAPS_KVM); - DO_TEST("cpu-Haswell2", QEMU_CAPS_KVM); - DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM); - DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM); - DO_TEST_NOCAPS("cpu-host-model-cmt"); - DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM); - qemuTestSetHostCPU(&driver, driver.hostarch, NULL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell", "x86_64", ARG_CAPS_HOST_C= PU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell2", "x86_64", ARG_CAPS_HOST_= CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell3", "x86_64", ARG_CAPS_HOST_= CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell-noTSX", "x86_64", ARG_CAPS_= HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-host-model-cmt", "x86_64", ARG_CAPS= _HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-tsc-frequency", "x86_64", ARG_CAPS_= HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_CAPS_LATEST("cpu-translation"); --=20 2.41.0