From nobody Fri Mar 29 08:38:46 2024 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=1633598494; cv=none; d=zohomail.com; s=zohoarc; b=b13BJYnjNTIBAfmgv2Xv4hnrSe1BroR9aW5eTDunNz3wNjvAL5EbDNkFKA5xdVNnMAcU84EffarpC7v3ox5XKiU+gwtj4XWNDKGXv8DDr6k9FuerRI9AxHFevpzINXnWTIUejaNKkFiC73Hufzw+0FEWPqs4HJTfkIbJ72tOk4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633598494; 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=gbQE7QcyZq+QKGy+58gT6/GUbZrN1q6aw/z13lubUiE=; b=Tfdjqbwka9i8FsI/tE2vXRfooyHSJX+17l7DZry0kDqw7iJnWc3B/aOtNiroghTGaXSHQgdgsZbXtpouKKOyy/vXW2+NZPDyiad/OPZKRGRCNY4QiSnp1eh3cFYk1LHO3NbEd8a7Q6UQKkrRDwNIKfpEfGcBYuC8DocWiLGI3kM= 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 1633598494145767.510876394952; Thu, 7 Oct 2021 02:21:34 -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-557-4ZlHdWujPcSmrFpzGI0rXg-1; Thu, 07 Oct 2021 05:21:23 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72FE41006AA5; Thu, 7 Oct 2021 09:21:18 +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 426CA1F478; Thu, 7 Oct 2021 09:21:18 +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 5CECC4E58E; Thu, 7 Oct 2021 09:21:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19795NZL025316 for ; Thu, 7 Oct 2021 05:05:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id F3BB05F4EE; Thu, 7 Oct 2021 09:05:22 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.195.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 362FE5F4E3; Thu, 7 Oct 2021 09:05:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633598493; 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=gbQE7QcyZq+QKGy+58gT6/GUbZrN1q6aw/z13lubUiE=; b=ErFVUciuubFpq6rcWY0XAbiDbfH076X+iGGiD5o7MmfxDnNs6hsZwUgfmVeO3Pr/vMB8od Mq2TKjO2cCQE28awVa96lNqrhrY1LSNutJLJoL3rIqN1hnMZcIUb4osGurMAMUKx5J91yQ YqNIMrtHX4l/dLKTAT4DxQSJhuJ4jcw= X-MC-Unique: 4ZlHdWujPcSmrFpzGI0rXg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/2] qemu: remove use of (+|-)name syntax for -cpu featres Date: Thu, 7 Oct 2021 10:05:12 +0100 Message-Id: <20211007090513.3977598-2-berrange@redhat.com> In-Reply-To: <20211007090513.3977598-1-berrange@redhat.com> References: <20211007090513.3977598-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.23 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633598494968100003 The -cpu arg gained support for feature=3Don|off syntax for the x86 emulator in 2.4.0 commit 38e5c119c2925812bd441450ab9e5e00fc79e662 Author: Eduardo Habkost Date: Mon Mar 23 17:29:32 2015 -0300 target-i386: Register QOM properties for feature flags Most other targets gained this syntax even earlier in 1.4.1 commit 1590bbcb02921dfe8e3cf66e3a3aafd31193babf Author: Andreas F=C3=A4rber Date: Mon Mar 3 23:33:51 2014 +0100 cpu: Implement CPUClass::parse_features() for the rest of CPUs CPUs who do not provide their own implementation of feature parsing will treat each option as a QOM property and set it to the supplied value. There appears no reason to keep supporting "+|-feature" syntax, given the current minimum QEMU version. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_command.c | 34 ++++++------------- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 2 +- .../cpu-check-default-partial.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- .../cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../cpu-host-model-fallback.args | 2 +- .../cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- .../graphics-spice-timeout.args | 2 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- .../pci-bridge-many-disks.args | 2 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- 31 files changed, 41 insertions(+), 53 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index eaa1e0deb9..0f1cdd9372 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6242,21 +6242,6 @@ qemuBuildGlobalControllerCommandLine(virCommand *cmd, } =20 =20 -static void -qemuBuildCpuFeature(virQEMUCaps *qemuCaps, - virBuffer *buf, - const char *name, - bool state) -{ - name =3D virQEMUCapsCPUFeatureToQEMU(qemuCaps, name); - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) - virBufferAsprintf(buf, ",%s=3D%s", name, state ? "on" : "off"); - else - virBufferAsprintf(buf, ",%c%s", state ? '+' : '-', name); -} - - static int qemuBuildCpuModelArgStr(virQEMUDriver *driver, const virDomainDef *def, @@ -6329,15 +6314,17 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, virBufferAsprintf(buf, ",vendor=3D%s", cpu->vendor_id); =20 for (i =3D 0; i < cpu->nfeatures; i++) { + const char *featname =3D virQEMUCapsCPUFeatureToQEMU( + qemuCaps, cpu->features[i].name); switch ((virCPUFeaturePolicy) cpu->features[i].policy) { case VIR_CPU_FEATURE_FORCE: case VIR_CPU_FEATURE_REQUIRE: - qemuBuildCpuFeature(qemuCaps, buf, cpu->features[i].name, true= ); + virBufferAsprintf(buf, ",%s=3Don", featname); break; =20 case VIR_CPU_FEATURE_DISABLE: case VIR_CPU_FEATURE_FORBID: - qemuBuildCpuFeature(qemuCaps, buf, cpu->features[i].name, fals= e); + virBufferAsprintf(buf, ",%s=3Doff", featname); break; =20 case VIR_CPU_FEATURE_OPTIONAL: @@ -6394,8 +6381,8 @@ qemuBuildCpuCommandLine(virCommand *cmd, switch ((virDomainTimerNameType)timer->name) { case VIR_DOMAIN_TIMER_NAME_KVMCLOCK: if (timer->present !=3D -1) { - qemuBuildCpuFeature(qemuCaps, &buf, "kvmclock", - !!timer->present); + virBufferAsprintf(&buf, ",kvmclock=3D%s", + timer->present ? "on" : "off"); } break; case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK: @@ -6433,13 +6420,14 @@ qemuBuildCpuCommandLine(virCommand *cmd, } =20 if (def->apic_eoi) { - qemuBuildCpuFeature(qemuCaps, &buf, "kvm_pv_eoi", - def->apic_eoi =3D=3D VIR_TRISTATE_SWITCH_ON); + virBufferAsprintf(&buf, ",kvm_pv_eoi=3D%s", def->apic_eoi =3D=3D + VIR_TRISTATE_SWITCH_ON ? "on" : "off"); } =20 if (def->features[VIR_DOMAIN_FEATURE_PVSPINLOCK]) { - qemuBuildCpuFeature(qemuCaps, &buf, VIR_CPU_x86_KVM_PV_UNHALT, - def->features[VIR_DOMAIN_FEATURE_PVSPINLOCK] = =3D=3D VIR_TRISTATE_SWITCH_ON); + virBufferAsprintf(&buf, ",%s=3D%s", VIR_CPU_x86_KVM_PV_UNHALT, + def->features[VIR_DOMAIN_FEATURE_PVSPINLOCK] =3D= =3D + VIR_TRISTATE_SWITCH_ON ? "on" : "off"); } =20 if (def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D=3D VIR_TRISTATE_SWITC= H_ON) { diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvd= ata/cpu-Haswell2.args index ed08de0d72..2d23840418 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu Haswell,-hle,-rtm \ +-cpu Haswell,hle=3Doff,rtm=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvd= ata/cpu-Haswell3.args index 110017cf0e..4bc2e0bc00 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu Haswell,+rtm,+hle \ +-cpu Haswell,rtm=3Don,hle=3Don \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml= 2argvdata/cpu-cache-disable3.args index 57e5da66ad..5f4e31d298 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-foo/= master-key.aes \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtp= r,+lahf_lm,l3-cache=3Doff \ +-cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds_cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf_lm=3Don,l3-cache=3Do= ff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/= qemuxml2argvdata/cpu-check-default-partial.args index d1010b1e5d..fbc5b84e0a 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtp= r,+lahf_lm \ +-cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds_cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf_lm=3Don \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2a= rgvdata/cpu-eoi-disabled.args index ce4b2e358f..e7cdcd2fd4 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args +++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.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,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu32,-kvm_pv_eoi \ +-cpu qemu32,kvm_pv_eoi=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2ar= gvdata/cpu-eoi-enabled.args index 6e60e11792..e22fc0410e 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args +++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.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,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu32,+kvm_pv_eoi \ +-cpu qemu32,kvm_pv_eoi=3Don \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdat= a/cpu-exact1.args index f0498090ed..b764431173 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu64,-mca,-pse36,-clflush,-syscall,-nx,-lm,-svm \ +-cpu qemu64,mca=3Doff,pse36=3Doff,clflush=3Doff,syscall=3Doff,nx=3Doff,lm= =3Doff,svm=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemu= xml2argvdata/cpu-exact2-nofallback.args index 0bb2f4c088..64609add1b 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx,-cx16,-tm2,= -pbe,-ss,-sse4a,-wdt \ +-cpu core2duo,ds=3Don,ht=3Don,tm=3Don,ds_cpl=3Don,xtpr=3Don,3dnowext=3Don,= lahf_lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pbe=3Doff,ss=3Doff,sse4a=3Doff,w= dt=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdat= a/cpu-exact2.args index 0bb2f4c088..64609add1b 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx,-cx16,-tm2,= -pbe,-ss,-sse4a,-wdt \ +-cpu core2duo,ds=3Don,ht=3Don,tm=3Don,ds_cpl=3Don,xtpr=3Don,3dnowext=3Don,= lahf_lm=3Don,nx=3Doff,cx16=3Doff,tm2=3Doff,pbe=3Doff,ss=3Doff,sse4a=3Doff,w= dt=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvd= ata/cpu-fallback.args index 0dbe3bf366..5a51295c74 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu Penryn,-sse4.1,-sse4.2,-popcnt,-aes \ +-cpu Penryn,sse4.1=3Doff,sse4.2=3Doff,popcnt=3Doff,aes=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2= argvdata/cpu-host-kvmclock.args index 63bd54c1b2..0a62f64747 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu host,-kvmclock \ +-cpu host,kvmclock=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml= 2argvdata/cpu-host-model-cmt.args index ffa9236a47..59ec868330 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.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,accel=3Dtcg,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 \ +-cpu Haswell,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,d= tes64=3Don,monitor=3Don,ds_cpl=3Don,vmx=3Don,smx=3Don,est=3Don,tm2=3Don,xtp= r=3Don,pdcm=3Don,f16c=3Don,rdrand=3Don,pdpe1gb=3Don,abm=3Don,lahf_lm=3Don \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qe= muxml2argvdata/cpu-host-model-fallback.args index e224f30d84..ed9424896f 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.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,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu Penryn,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+monitor,+ds_cpl,+vmx,+est,+tm= 2,+xtpr,-sse4.1,+cx16,+lahf_lm \ +-cpu Penryn,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,mo= nitor=3Don,ds_cpl=3Don,vmx=3Don,est=3Don,tm2=3Don,xtpr=3Don,sse4.1=3Doff,cx= 16=3Don,lahf_lm=3Don \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemu= xml2argvdata/cpu-host-model-vendor.args index 967d74c7c2..a0705a835d 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.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,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu 'core2duo,vendor=3DLibvirt QEMU,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+v= mx,+est,+tm2,+cx16,+xtpr,+lahf_lm' \ +-cpu 'core2duo,vendor=3DLibvirt QEMU,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm= =3Don,pbe=3Don,ds_cpl=3Don,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,l= ahf_lm=3Don' \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2arg= vdata/cpu-host-model.args index 96fe2f9edb..bce7e37d50 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.args +++ b/tests/qemuxml2argvdata/cpu-host-model.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 q35,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtp= r,+lahf_lm \ +-cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds_cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf_lm=3Don \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/te= sts/qemuxml2argvdata/cpu-host-passthrough-features.args index 8c03bd1171..468088f0b2 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu host,+abm,+ds,-invtsc \ +-cpu host,abm=3Don,ds=3Don,invtsc=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvd= ata/cpu-kvmclock.args index e12fbbb503..9bd3748f04 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,-kvmclock \ +-cpu core2duo,kvmclock=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvd= ata/cpu-minimum1.args index ff3365b7ff..bc86256b00 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtp= r,+lahf_lm \ +-cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds_cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf_lm=3Don \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvd= ata/cpu-minimum2.args index 7a07bea1b4..0839c8100c 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtp= r,+lahf_lm,-syscall,-nx,-lm,-svm \ +-cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds_cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf_lm=3Don,syscall=3Dof= f,nx=3Doff,lm=3Doff,svm=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvda= ta/cpu-strict1.args index fcd159e5fd..d5ffdabcc8 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,+ds,+acpi,+ht,+tm,+ds_cpl,+vmx,+est,+xtpr,+3dnowext,+lahf_lm= ,-nx,-cx16,-tm2,-pbe,-ss,-sse4a,-wdt \ +-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 \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/te= sts/qemuxml2argvdata/cpu-translation.x86_64-latest.args index bb6b5c9986..10aa65150f 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu Haswell,pclmulqdq=3Don,ds-cpl=3Don,tsc-adjust=3Don,fxsr-opt=3Don,lahf= -lm=3Don,cmp-legacy=3Don,nodeid-msr=3Don,perfctr-core=3Don,perfctr-nb=3Don,= kvm-pv-eoi=3Don,kvm-pv-unhalt=3Don \ +-cpu Haswell,pclmulqdq=3Don,ds-cpl=3Don,tsc-adjust=3Don,fxsr-opt=3Don,lahf= -lm=3Don,cmp-legacy=3Don,nodeid-msr=3Don,perfctr-core=3Don,perfctr-nb=3Don,= kvm_pv_eoi=3Don,kvm_pv_unhalt=3Don \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2= argvdata/cpu-tsc-frequency.args index 3a7d69d6b7..0f9bc25ab7 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.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,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=3D4567890000 \ +-cpu Haswell,vme=3Don,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,d= tes64=3Don,monitor=3Don,ds_cpl=3Don,vmx=3Don,smx=3Don,est=3Don,tm2=3Don,xtp= r=3Don,pdcm=3Don,f16c=3Don,rdrand=3Don,pdpe1gb=3Don,abm=3Don,lahf_lm=3Don,i= nvtsc=3Don,tsc-frequency=3D4567890000 \ -m 214 \ -realtime mlock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests= /qemuxml2argvdata/eoi-disabled.x86_64-latest.args index 6f67fb3bc6..32ae60cd90 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu qemu64,kvm-pv-eoi=3Doff \ +-cpu qemu64,kvm_pv_eoi=3Doff \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/= qemuxml2argvdata/eoi-enabled.x86_64-latest.args index 8ba1627a53..ae6f735459 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu qemu64,kvm-pv-eoi=3Don \ +-cpu qemu64,kvm_pv_eoi=3Don \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qem= uxml2argvdata/graphics-spice-timeout.args index 61d986b2e6..9a14cfc3b2 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=3Dspice \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-f14/= master-key.aes \ -machine pc,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtp= r,+lahf_lm \ +-cpu core2duo,ds=3Don,acpi=3Don,ss=3Don,ht=3Don,tm=3Don,pbe=3Don,ds_cpl=3D= on,vmx=3Don,est=3Don,tm2=3Don,cx16=3Don,xtpr=3Don,lahf_lm=3Don \ -m 1024 \ -realtime mlock=3Doff \ -smp 2,sockets=3D1,cores=3D2,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.arg= s b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args index 57bdb536ab..0e67351e38 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu qemu64,kvmclock=3Doff,kvm-pv-eoi=3Doff \ +-cpu qemu64,kvmclock=3Doff,kvm_pv_eoi=3Doff \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/= kvmclock.args index 174cc7ad07..cce20dbfed 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu32,-kvmclock \ +-cpu qemu32,kvmclock=3Doff \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemu= xml2argvdata/pci-bridge-many-disks.args index eec754d2ae..500b4d0e47 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-lots= -of-disks/master-key.aes \ -machine pc-i440fx-1.4,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu64,-kvmclock \ +-cpu qemu64,kvmclock=3Doff \ -bios /usr/share/seabios/bios.bin \ -m 3907 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args= b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args index a7a107f4b8..2188ff477d 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu qemu64,kvm-pv-unhalt=3Doff \ +-cpu qemu64,kvm_pv_unhalt=3Doff \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args = b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args index b217034eb0..a4f1eaedbc 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu qemu64,kvm-pv-unhalt=3Don \ +-cpu qemu64,kvm_pv_unhalt=3Don \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --=20 2.31.1 From nobody Fri Mar 29 08:38:46 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=1633599376; cv=none; d=zohomail.com; s=zohoarc; b=K4+ZobbouBACwYcMfjNBin/payqAk8DdwbhMWdciqwbnqjJS+m4azB2GPZ5IGi/v0rSyiIkds9kFJkG7J89xedtlQkNt/2Ar3/MnBvJlJ29i9CLPOao0CbzCqL8pCknuIrVHmQJ2JTabyvK+mrLYS11mA7DuyTQQRqQA6ocBzAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633599376; h=Content-Type:Content-Transfer-Encoding:Cc: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=jd/t+lYCCDch94JgwKvJI0k1kiSrmGaYXe4txzWF8o8=; b=Vx8VzNcn7lzV6gvEWQHDJ0NIqnvXaA4njYfBLSvWrkGzGDkbpJei3Tp3+vpyxeBgp2eBJ2zlAdTw2m0s8plTc36WIZhLkPOIK3muTP7Ln0aZRCD+kRUxpUw+vPot944X6ritYWq38ZzFH/wMrVIO3xL51QxU8JqDtGvnElJ49XQ= 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 1633599376796283.01172583094115; Thu, 7 Oct 2021 02:36:16 -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-44-thsL7JgSMF2tAQ5l9NmEjg-1; Thu, 07 Oct 2021 05:36:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 664C8893FD6; Thu, 7 Oct 2021 09:24:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 471F05C1B4; Thu, 7 Oct 2021 09:24:47 +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 190A7180598A; Thu, 7 Oct 2021 09:24:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19795Oxu025327 for ; Thu, 7 Oct 2021 05:05:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1DE405F4ED; Thu, 7 Oct 2021 09:05:24 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.195.96]) by smtp.corp.redhat.com (Postfix) with ESMTP id 490DF5F4E3; Thu, 7 Oct 2021 09:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633599375; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=jd/t+lYCCDch94JgwKvJI0k1kiSrmGaYXe4txzWF8o8=; b=KZEaoE6b1Nww2I6xT/SDvuP0nUhVUNoixEaRV0Ahuw6FAjGuv7rqQ10e6NYHQtOuJddtp1 0sVjHaPDqMA0f75Q99rdU6mwpHgh0WIh3MykByXNUkZ7Xgf82JMfuT4hy9drqss8neAhbE cuotKWr8eT1GEPkWLvoveg6vsDKa1UY= X-MC-Unique: thsL7JgSMF2tAQ5l9NmEjg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/2] qemu: remove use of implicit boolean syntax for -cpu features Date: Thu, 7 Oct 2021 10:05:13 +0100 Message-Id: <20211007090513.3977598-3-berrange@redhat.com> In-Reply-To: <20211007090513.3977598-1-berrange@redhat.com> References: <20211007090513.3977598-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa 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.16 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633599378432100001 Some CPU features are still added using implicit syntax "feature" which is a deprecated shorthand for "feature=3Don". Reviewed-by: Peter Krempa Signed-off-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_command.c | 6 +++--- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/hyperv.x86_64-latest.args | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0f1cdd9372..83d278fd02 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6387,7 +6387,7 @@ qemuBuildCpuCommandLine(virCommand *cmd, break; case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK: if (timer->present =3D=3D 1) - virBufferAddLit(&buf, ",hv-time"); + virBufferAddLit(&buf, ",hv-time=3Don"); break; case VIR_DOMAIN_TIMER_NAME_TSC: if (timer->frequency > 0) @@ -6451,12 +6451,12 @@ qemuBuildCpuCommandLine(virCommand *cmd, case VIR_DOMAIN_HYPERV_IPI: case VIR_DOMAIN_HYPERV_EVMCS: if (def->hyperv_features[i] =3D=3D VIR_TRISTATE_SWITCH_ON) - virBufferAsprintf(&buf, ",%s%s", + virBufferAsprintf(&buf, ",%s%s=3Don", hvPrefix, virDomainHypervTypeToString(i)); if ((i =3D=3D VIR_DOMAIN_HYPERV_STIMER) && (def->hyperv_stimer_direct =3D=3D VIR_TRISTATE_SWITCH_= ON)) - virBufferAsprintf(&buf, ",%s", VIR_CPU_x86_HV_STIMER_D= IRECT); + virBufferAsprintf(&buf, ",%s=3Don", VIR_CPU_x86_HV_STI= MER_DIRECT); break; =20 case VIR_DOMAIN_HYPERV_SPINLOCKS: diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qem= uxml2argvdata/clock-timer-hyperv-rtc.args index 0f1707fd7b..11ba1eb1e8 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.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,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ --cpu qemu32,hv-time \ +-cpu qemu32,hv-time=3Don \ -m 214 \ -realtime mlock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args= b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args index a05c009389..5f8041c0fe 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu qemu64,hv-vpindex,hv-synic,hv-stimer,hv-stimer-direct \ +-cpu qemu64,hv-vpindex=3Don,hv-synic=3Don,hv-stimer=3Don,hv-stimer-direct= =3Don \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args b/tests/qemuxm= l2argvdata/hyperv.x86_64-4.0.0.args index 100223b53a..82a2aa3d5b 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv.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=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --cpu 'qemu32,hv_relaxed,hv_vapic,hv-spinlocks=3D0x2fff,hv_vpindex,hv_runti= me,hv_synic,hv_stimer,hv_reset,hv-vendor-id=3DKVM Hv,hv_frequencies,hv_reen= lightenment,hv_tlbflush,hv_ipi,hv_evmcs' \ +-cpu 'qemu32,hv_relaxed=3Don,hv_vapic=3Don,hv-spinlocks=3D0x2fff,hv_vpinde= x=3Don,hv_runtime=3Don,hv_synic=3Don,hv_stimer=3Don,hv_reset=3Don,hv-vendor= -id=3DKVM Hv,hv_frequencies=3Don,hv_reenlightenment=3Don,hv_tlbflush=3Don,h= v_ipi=3Don,hv_evmcs=3Don' \ -m 214 \ -overcommit mem-lock=3Doff \ -smp 6,sockets=3D6,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemux= ml2argvdata/hyperv.x86_64-latest.args index 32ee369ff3..9b70980f3a 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -11,7 +11,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --cpu 'qemu64,hv-relaxed,hv-vapic,hv-spinlocks=3D0x2fff,hv-vpindex,hv-runti= me,hv-synic,hv-stimer,hv-reset,hv-vendor-id=3DKVM Hv,hv-frequencies,hv-reen= lightenment,hv-tlbflush,hv-ipi,hv-evmcs' \ +-cpu 'qemu64,hv-relaxed=3Don,hv-vapic=3Don,hv-spinlocks=3D0x2fff,hv-vpinde= x=3Don,hv-runtime=3Don,hv-synic=3Don,hv-stimer=3Don,hv-reset=3Don,hv-vendor= -id=3DKVM Hv,hv-frequencies=3Don,hv-reenlightenment=3Don,hv-tlbflush=3Don,h= v-ipi=3Don,hv-evmcs=3Don' \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ -overcommit mem-lock=3Doff \ --=20 2.31.1