From nobody Sun Feb 8 13:08:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1728383295655555.9105214692657; Tue, 8 Oct 2024 03:28:15 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 91ABB1472; Tue, 8 Oct 2024 06:28:14 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 80D0513E8; Tue, 8 Oct 2024 06:27:05 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 84E031402; Tue, 8 Oct 2024 06:27:01 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E1E8B1402 for ; Tue, 8 Oct 2024 06:26:55 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-218-5OHn__57M6qEzQG3g0wluw-1; Tue, 08 Oct 2024 06:26:54 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8DBD51955F42 for ; Tue, 8 Oct 2024 10:26:53 +0000 (UTC) Received: from orkuz (unknown [10.43.3.115]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1D62819560A2 for ; Tue, 8 Oct 2024 10:26:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728383215; h=from:from: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; bh=Zg4he96lDck+fcivixRGRme4ugdQWW/aVFSpZkVTQK4=; b=aRh+pelVWTn04KkTr+DoUjIBAteNVBIsdO9Dh08rps8LioYarfzkDt7bvjapLwaJgRSOBy 3lZJKHHNaxjQcjTrhRMeqMJJqkDnfmxNbew01kzrleDj20f0huZDoUJCdQT7mzszUYdups v+WH99sj5DGxbdvwtyjuAm3YlgTjLOM= X-MC-Unique: 5OHn__57M6qEzQG3g0wluw-1 From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 2/7] qemu: Do not drop unknown CPU features from domain XML Date: Tue, 8 Oct 2024 12:26:41 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: U4DPY2JLM4VIQ4RZK3W5VFU6RRT2PSEQ X-Message-ID-Hash: U4DPY2JLM4VIQ4RZK3W5VFU6RRT2PSEQ X-MailFrom: jdenemar@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1728383296947116600 Content-Type: text/plain; charset="utf-8" CPU features with policy=3D'disable' which are unknown to QEMU may be safely skipped when generating the -cpu command line, but we should still keep them in the domain definition so that we can properly check they are disabled after migrating the domain to a newer QEMU. Signed-off-by: Jiri Denemark --- src/qemu/qemu_command.c | 13 ++++++++++++- src/qemu/qemu_process.c | 32 -------------------------------- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0c9e5f8b3..b4888a5822 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6095,6 +6095,7 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, { size_t i; virCPUDef *cpu =3D def->cpu; + g_auto(GStrv) knownFeatures =3D NULL; =20 switch ((virCPUMode) cpu->mode) { case VIR_CPU_MODE_HOST_PASSTHROUGH: @@ -6153,9 +6154,14 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, if (cpu->vendor_id) virBufferAsprintf(buf, ",vendor=3D%s", cpu->vendor_id); =20 + if (ARCH_IS_X86(def->os.arch) && + virQEMUCapsGetCPUFeatures(qemuCaps, def->virtType, false, &knownFe= atures) < 0) + return -1; + for (i =3D 0; i < cpu->nfeatures; i++) { const char *featname =3D virQEMUCapsCPUFeatureToQEMU(def->os.arch, cpu->features[i].nam= e); + switch ((virCPUFeaturePolicy) cpu->features[i].policy) { case VIR_CPU_FEATURE_FORCE: case VIR_CPU_FEATURE_REQUIRE: @@ -6164,7 +6170,12 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, =20 case VIR_CPU_FEATURE_DISABLE: case VIR_CPU_FEATURE_FORBID: - virBufferAsprintf(buf, ",%s=3Doff", featname); + /* Features unknown to QEMU are implicitly disabled and we can= just + * skip them. */ + if (!knownFeatures || + g_strv_contains((const char **) knownFeatures, cpu->featur= es[i].name)) { + virBufferAsprintf(buf, ",%s=3Doff", featname); + } break; =20 case VIR_CPU_FEATURE_OPTIONAL: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a00066e88e..0e9e1a8efc 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6212,26 +6212,6 @@ qemuProcessSetupHotpluggableVcpus(virDomainObj *vm, } =20 =20 -static bool -qemuProcessDropUnknownCPUFeatures(const char *name, - virCPUFeaturePolicy policy, - void *opaque) -{ - const char **features =3D opaque; - - if (policy !=3D VIR_CPU_FEATURE_DISABLE && - policy !=3D VIR_CPU_FEATURE_FORBID) - return true; - - if (g_strv_contains(features, name)) - return true; - - /* Features unknown to QEMU are implicitly disabled, we can just drop = them - * from the definition. */ - return false; -} - - static int qemuProcessUpdateGuestCPU(virDomainDef *def, virQEMUCaps *qemuCaps, @@ -6325,18 +6305,6 @@ qemuProcessUpdateGuestCPU(virDomainDef *def, &def->os.arch) < 0) return -1; =20 - if (ARCH_IS_X86(def->os.arch)) { - g_auto(GStrv) features =3D NULL; - - if (virQEMUCapsGetCPUFeatures(qemuCaps, def->virtType, false, &fea= tures) < 0) - return -1; - - if (features && - virCPUDefFilterFeatures(def->cpu, qemuProcessDropUnknownCPUFea= tures, - features) < 0) - return -1; - } - return 0; } =20 --=20 2.46.2