From nobody Fri Oct 18 06:16:16 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) 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 1706128498207268.7871515778081; Wed, 24 Jan 2024 12:34:58 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id F23F81BB8; Wed, 24 Jan 2024 15:34:56 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 013A018CE; Wed, 24 Jan 2024 14:42:19 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 652C91A2D; Wed, 24 Jan 2024 14:39:01 -0500 (EST) 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 599C01926 for ; Wed, 24 Jan 2024 14:38:15 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-OxAuGWtKMgKaIaGsRF6y-A-1; Wed, 24 Jan 2024 14:38:13 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 07E758350E1 for ; Wed, 24 Jan 2024 19:38:13 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 88BF0492BC9 for ; Wed, 24 Jan 2024 19:38:12 +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.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: OxAuGWtKMgKaIaGsRF6y-A-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 22/33] qemu: Move qemuDomainForbidLegacyUSBController() Date: Wed, 24 Jan 2024 20:37:42 +0100 Message-ID: <20240124193753.1265454-23-abologna@redhat.com> In-Reply-To: <20240124193753.1265454-1-abologna@redhat.com> References: <20240124193753.1265454-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: GOUAA3EW73AVQEL4H3INIXLKEOYN236O X-Message-ID-Hash: GOUAA3EW73AVQEL4H3INIXLKEOYN236O 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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1706128499583100001 This function is tightly coupled with qemuDomainDefaultUSBControllerModel(), as whether or not the legacy '-usb' option is going to be used depends on the return value of both. As such, it makes sense for them to be close to one another. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 16 ++-------------- src/qemu/qemu_domain.c | 12 ++++++++++++ src/qemu/qemu_domain.h | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4aad7066e9..ec4982bbf6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2918,18 +2918,6 @@ qemuBuildControllerDevProps(const virDomainDef *doma= inDef, } =20 =20 -static bool -qemuBuildDomainForbidLegacyUSBController(const virDomainDef *def) -{ - if (qemuDomainIsQ35(def) || - qemuDomainIsARMVirt(def) || - qemuDomainIsRISCVVirt(def)) - return true; - - return false; -} - - static int qemuBuildLegacyUSBControllerCommandLine(virCommand *cmd, const virDomainDef *def) @@ -2961,7 +2949,7 @@ qemuBuildLegacyUSBControllerCommandLine(virCommand *c= md, } =20 if (nusb =3D=3D 0 && - !qemuBuildDomainForbidLegacyUSBController(def) && + !qemuDomainForbidLegacyUSBController(def) && !ARCH_IS_S390(def->os.arch)) { /* We haven't added any USB controller yet, but we haven't been as= ked * not to add one either. Add a legacy USB controller, unless we're @@ -3061,7 +3049,7 @@ qemuBuildControllersByTypeCommandLine(virCommand *cmd, =20 if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT && - !qemuBuildDomainForbidLegacyUSBController(def)) { + !qemuDomainForbidLegacyUSBController(def)) { =20 /* An appropriate default USB controller model should already * have been selected in qemuDomainDeviceDefPostParse(); if diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dcf73c0e08..2b7eae295b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4258,6 +4258,18 @@ qemuDomainDefaultUSBControllerModel(const virDomainD= ef *def, } =20 =20 +bool +qemuDomainForbidLegacyUSBController(const virDomainDef *def) +{ + if (qemuDomainIsQ35(def) || + qemuDomainIsARMVirt(def) || + qemuDomainIsRISCVVirt(def)) + return true; + + return false; +} + + static int qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, virDomainDef *def, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 48f966fa2a..4e61d741f3 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -839,6 +839,7 @@ bool qemuDomainSupportsPCIMultibus(const virDomainDef *= def); int qemuDomainDefaultSCSIControllerModel(const virDomainDef *def, const virDomainControllerDef *con= t, virQEMUCaps *qemuCaps); +bool qemuDomainForbidLegacyUSBController(const virDomainDef *def); =20 void qemuDomainUpdateCurrentMemorySize(virDomainObj *vm); =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org