From nobody Tue Oct 29 21:20:22 2024 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 1728383368341176.1240441130136; Tue, 8 Oct 2024 03:29:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 54CD11447; Tue, 8 Oct 2024 06:29:27 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 71F3315FC; Tue, 8 Oct 2024 06:27:19 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9021AC5B; Tue, 8 Oct 2024 06:27:15 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 A0288144B for ; Tue, 8 Oct 2024 06:27:01 -0400 (EDT) Received: from mx-prod-mc-05.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-661-MmVC01ksNueiKftjhH7zSg-1; Tue, 08 Oct 2024 06:27:00 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4CA74195608B for ; Tue, 8 Oct 2024 10:26:59 +0000 (UTC) Received: from orkuz (unknown [10.43.3.115]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CFCCC1956052 for ; Tue, 8 Oct 2024 10:26:58 +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=1728383221; 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=7wdTosAoWXOq2SscQq/aQxgMasfWGgflFqLnr5r3/ho=; b=WOLAwnYoVdtK59xEywKmkNxkix1M8Qpoyf82VbKiJmkV2hO5YHxZ11LA7SdegfqCyjeAoC uCKdGn7Y19CmA5b8E4Xtwp6KMYEWg8TOtOyXXEGzYBD4/hTmoOLmcI7a6A2nCRLGQNcxRG WVpFUcrtDUio1UJs/dDu2HnR/Clx/QU= X-MC-Unique: MmVC01ksNueiKftjhH7zSg-1 From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 5/7] qemu: Replace big condition in virQEMUCapsCPUFilterFeatures with array Date: Tue, 8 Oct 2024 12:26:44 +0200 Message-ID: <6dc8c5c4e1339e61edc43a17cc13e74a5a837240.1728383133.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LUGRMEVRQP6F46RS5M3VUXR2ITBDSMEL X-Message-ID-Hash: LUGRMEVRQP6F46RS5M3VUXR2ITBDSMEL 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: 1728383369234116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/qemu/qemu_capabilities.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1d7ac9803d..f930ad2acf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3531,22 +3531,26 @@ virQEMUCapsProbeQMPSGXCapabilities(virQEMUCaps *qem= uCaps, * QEMU never supported them or they were dropped as they never did anythi= ng * useful. */ +const char *ignoredFeatures[] =3D { + "cmt", "mbm_total", "mbm_local", /* never supported by QEMU */ + "osxsave", "ospke", /* dropped from QEMU */ +}; + bool virQEMUCapsCPUFilterFeatures(const char *name, virCPUFeaturePolicy policy G_GNUC_UNUSED, void *opaque) { virArch *arch =3D opaque; + size_t i; =20 if (!ARCH_IS_X86(*arch)) return true; =20 - if (STREQ(name, "cmt") || - STREQ(name, "mbm_total") || - STREQ(name, "mbm_local") || - STREQ(name, "osxsave") || - STREQ(name, "ospke")) - return false; + for (i =3D 0; i < G_N_ELEMENTS(ignoredFeatures); i++) { + if (STREQ(name, ignoredFeatures[i])) + return false; + } =20 return true; } --=20 2.46.2