From nobody Mon Feb 9 17:07:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629294156; cv=none; d=zohomail.com; s=zohoarc; b=kobM2tRwL83nL60UYdFuydG/f049dPBk9S/BZd8QP5oT1jmC3jdO2s/2KSIgox78wfGaNMmOm+thAbXnCHjcGmdJOXN9CbcJDAi+gToT5p88Arb+yeq9Czref0IXCNSXmWm3MlT7vdjIsODiX04NtVfxie0KDC6kfUMfJOeoIHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629294156; 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=ggR9T8Ln5XtvNZeL9ueTmVyEC5A+E5jH+t4yHWTWzWM=; b=ZPGJ9a8FbUoVYlINDpFVx4uMyk6QBGL4ds+DDi60/bBf8Sv1vtg2/OGrJb7nI6WvmzJLSHBdNJMukb4pd3hy3o/XFBkUvtlER875sArza0JO/rNj8g9bjlgDkwiXee+OitsMQ8t9ATfn3CQNGjYra1CFlEQ7CEwYUTM9tuSyB3s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629294156794483.1555434802319; Wed, 18 Aug 2021 06:42:36 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-101-oHenDnVpNGKpxBNLLm8QNw-1; Wed, 18 Aug 2021 09:42:34 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 15062C7443; Wed, 18 Aug 2021 13:42:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 086DB5D6A8; Wed, 18 Aug 2021 13:42:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C97E34A700; Wed, 18 Aug 2021 13:42:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17IDfL9N005615 for ; Wed, 18 Aug 2021 09:41:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id C08CE19C87; Wed, 18 Aug 2021 13:41:21 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26B01369A for ; Wed, 18 Aug 2021 13:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629294155; 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=ggR9T8Ln5XtvNZeL9ueTmVyEC5A+E5jH+t4yHWTWzWM=; b=BgOYVSWNx/Y8+QTK7CDu0Yc7IpE87luZ0ynTBiR+1gm5+UVDajm13qoYj2gbbWEgTfk8DB ZvJeG0yy9w+c3L4/Y1H1mEnBh2V4fu0+sktQbOgjEI7l7ZIDGAu4Qn45baS+Os9FA111J9 DMzLWzNyNtCuJQ3QAklHBFpnGZd7DK8= X-MC-Unique: oHenDnVpNGKpxBNLLm8QNw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/6] qemuxml2argvtest: Unify 'cpu-tsc-frequency' and 'cpu-tsc-high-frequency' case Date: Wed, 18 Aug 2021 15:41:05 +0200 Message-Id: <7b7568b4f8e3a4833e3eb47694c28300a1e916a1.1629293828.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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: 1629294159002100001 Content-Type: text/plain; charset="utf-8" Use the larger number in the original test to avoid having two files. Additionally this avoids use of 'host-model' with DO_TEST_CAPS_LATEST in cases when it isn't necessary for the purpose of the test as the CPU model tends to change. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.xml | 2 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 33 ----------------- .../cpu-tsc-high-frequency.xml | 35 ------------------- tests/qemuxml2argvtest.c | 1 - 6 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-la= test.args delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-high-frequency.xml diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2= argvdata/cpu-tsc-frequency.args index 1f582f720c..2a031b6ef0 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx= ,+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+invtsc,ts= c-frequency=3D3504000000 \ +-cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx= ,+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+invtsc,ts= c-frequency=3D4567890000 \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args b/t= ests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args index cc78591c97..91b6e7943b 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ -machine pc-i440fx-4.0,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc_adjust=3Don,= clflushopt=3Don,umip=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,invtsc=3Don,ts= c-frequency=3D3504000000 \ +-cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc_adjust=3Don,= clflushopt=3Don,umip=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,invtsc=3Don,ts= c-frequency=3D4567890000 \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.xml b/tests/qemuxml2a= rgvdata/cpu-tsc-frequency.xml index adb118c527..afaef6e8e5 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.xml +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.xml @@ -18,7 +18,7 @@ - + destroy restart diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args deleted file mode 100644 index c39817af98..0000000000 --- a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args +++ /dev/null @@ -1,33 +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 \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,= amd-ssbd=3Don,virt-ssbd=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don,mds-no= =3Don,pschange-mc-no=3Don,svm=3Doff,npt=3Doff,nrip-save=3Doff,invtsc=3Don,t= sc-frequency=3D4567890000 \ --m 214 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ --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 piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.xml b/tests/qemu= xml2argvdata/cpu-tsc-high-frequency.xml deleted file mode 100644 index afaef6e8e5..0000000000 --- a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.xml +++ /dev/null @@ -1,35 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - A description of the test machine. - - A test of qemu's minimal configuration. - This test also tests the description and title elements. - - 219100 - 219100 - 1 - - hvm - - - - - - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4ce7ed5f00..4e7d1da216 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2102,7 +2102,6 @@ mymain(void) DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0"); DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM); DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0"); - DO_TEST_CAPS_LATEST("cpu-tsc-high-frequency"); DO_TEST_CAPS_VER("cpu-translation", "4.0.0"); DO_TEST_CAPS_LATEST("cpu-translation"); qemuTestSetHostCPU(&driver, driver.hostarch, NULL); --=20 2.31.1