From nobody Sat Feb 7 08:02:24 2026 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