From nobody Sat Feb 7 06:00:14 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 1724850617833638.8771656486076; Wed, 28 Aug 2024 06:10:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9862F141A; Wed, 28 Aug 2024 09:10:16 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 590C11495; Wed, 28 Aug 2024 09:09:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 11FD7128D; Wed, 28 Aug 2024 09:09:20 -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 951DB12B5 for ; Wed, 28 Aug 2024 09:09:08 -0400 (EDT) Received: from mx-prod-mc-02.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-17-AO15obvjOqaVIJ1yB5Ajng-1; Wed, 28 Aug 2024 09:09:06 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D17171872572 for ; Wed, 28 Aug 2024 13:09:03 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.69]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E57941955D59 for ; Wed, 28 Aug 2024 13:09:01 +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.6 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,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE 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=1724850548; 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=tm91kpjLP0ukIij7hODjuXUSUpjbWYYW7ByJ7oTKekg=; b=jKi+UYyVGaAexuBsARKw609M2rDJzStAOpzQalpM8zISDVbZ0P+A5J7sZKHsejkfzrf+wq IcJcNtNDGNl7L3lUKg1OMiwCD1COo15xtZWiD7qNDE852YUvjYF1nv0uBjIVj2middKijo oNm64K/XE6Ix24dfRsJdpDi4tKWY8TE= X-MC-Unique: AO15obvjOqaVIJ1yB5Ajng-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH FOR-10.7.0 2/3] qemu: Change signature for virQEMUCapsSupportsI8042Toggle() Date: Wed, 28 Aug 2024 15:08:55 +0200 Message-ID: <20240828130856.432113-3-abologna@redhat.com> In-Reply-To: <20240828130856.432113-1-abologna@redhat.com> References: <20240828130856.432113-1-abologna@redhat.com> 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: USBVZYELLLAFA35KV2KEGTBTOJZROPDF X-Message-ID-Hash: USBVZYELLLAFA35KV2KEGTBTOJZROPDF X-MailFrom: abologna@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: 1724850619726116600 Content-Type: text/plain; charset="utf-8"; x-default="true" We will soon need to use it in a context where we don't have a virDomainDef handy. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_capabilities.c | 11 ++++++----- src/qemu/qemu_capabilities.h | 3 ++- src/qemu/qemu_validate.c | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2d53e87ff3..bde28ad083 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6032,15 +6032,16 @@ virQEMUCapsSupportsI8042(virQEMUCaps *qemuCaps, =20 bool virQEMUCapsSupportsI8042Toggle(virQEMUCaps *qemuCaps, - const virDomainDef *def) + const char *machine, + const virArch arch) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_I8042_OPT)) return false; =20 - return qemuDomainIsI440FX(def) || - qemuDomainIsQ35(def) || - qemuDomainIsXenFV(def) || - STREQ(def->os.machine, "isapc"); + return qemuDomainMachineIsI440FX(machine, arch) || + qemuDomainMachineIsQ35(machine, arch) || + qemuDomainMachineIsXenFV(machine, arch) || + STREQ(machine, "isapc"); } =20 =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 9c577c1505..5036d49aab 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -723,7 +723,8 @@ bool virQEMUCapsSupportsI8042(virQEMUCaps *qemuCaps, const virDomainDef *def); =20 bool virQEMUCapsSupportsI8042Toggle(virQEMUCaps *qemuCaps, - const virDomainDef *def); + const char *machine, + const virArch arch); =20 const char *virQEMUCapsGetBinary(virQEMUCaps *qemuCaps); virArch virQEMUCapsGetArch(virQEMUCaps *qemuCaps); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index f74c538efe..3c40f76c12 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -258,7 +258,7 @@ qemuValidateDomainDefFeatures(const virDomainDef *def, } =20 if (def->features[i] !=3D VIR_TRISTATE_SWITCH_ABSENT && - !virQEMUCapsSupportsI8042Toggle(qemuCaps, def)) { + !virQEMUCapsSupportsI8042Toggle(qemuCaps, def->os.machine,= def->os.arch)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("ps2 feature state cannot be controlled w= ith this QEMU binary")); return -1; --=20 2.46.0