From nobody Mon Sep 8 17:08:15 2025 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1755622234; cv=none; d=zohomail.com; s=zohoarc; b=Xz0D8NWDHvzI+sfLnduSbkHcYoNLxO9Af+N8Px3OGH2GEEkfWGlWAZ75P9EwKZgRvHCTahAtQBqQ2UQhSf94tYl2LuxBe5xpwev1JNJk1o68GdEtQ05lTfl+Nnkkzz8ya/CGDEryyY83Y0fRqdrAJyFTtyDfHItKudckY8J5D/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755622234; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=/l6ieGpMMHE4KEFDV6GpNm8/kiwpn8gbeRbrHVwQdbI=; b=QhbYp/ONdKdMH8Dx5mB19R2hxkw28PIgtf7zO3bj9E8C3ZOVEt2QQlfQi8GRpgncmTKtPzl5MEpRj8e56CaHSoUF53DDEU/hPz8E6fxfh5jEyJObhgJRh8ZhNexm4J0CNsQNb6YQ+D1goUcwiumbztPlc3q+ftIQgsl0glguxEM= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1755622234685410.4136692904423; Tue, 19 Aug 2025 09:50:34 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8223892D; Tue, 19 Aug 2025 12:50:33 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F1034120C; Tue, 19 Aug 2025 12:24:26 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 57198B09; Tue, 19 Aug 2025 12:24:22 -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 DBA84BC5 for ; Tue, 19 Aug 2025 12:23:13 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-R49gFVCLNtqnIL074fZBhw-1; Tue, 19 Aug 2025 12:23:12 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4DBEB180035C for ; Tue, 19 Aug 2025 16:23:11 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.253]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 77824180044F for ; Tue, 19 Aug 2025 16:23:10 +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=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS 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=1755620593; 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=pjafowVMPW2h9h1ktYSbIucWFR/DMFpggSY4msG2FNo=; b=Git+rGcbJEVO3h2XcNlaOiBpXhV1cptjJYWNFgTi+vUBA0O61nkjQAbYhSj8Z7AvpIAed5 TeNfxENvF989+ZXFlp2OuuXg9T7HBaJROnOHFJB7yX0aKpHWgDfVbWoQaTnDKeGZCUCIrp iLkskKOAT0aTr4sYeL+pokqWZDImTRQ= X-MC-Unique: R49gFVCLNtqnIL074fZBhw-1 X-Mimecast-MFC-AGG-ID: R49gFVCLNtqnIL074fZBhw_1755620591 To: devel@lists.libvirt.org Subject: [PATCH 23/31] qemu: Validate USB controllers earlier Date: Tue, 19 Aug 2025 18:22:27 +0200 Message-ID: <20250819162235.468215-24-abologna@redhat.com> In-Reply-To: <20250819162235.468215-1-abologna@redhat.com> References: <20250819162235.468215-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: TbfMe_QKC-Ul_8SlueoQP3snPhQLsKZQibldbg8Xmtg_1755620591 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: E42OKOXDZOKN36ROKLQSMGDYXGPOJVHO X-Message-ID-Hash: E42OKOXDZOKN36ROKLQSMGDYXGPOJVHO 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: From: Andrea Bolognani via Devel Reply-To: Andrea Bolognani X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1755622235643116600 Content-Type: text/plain; charset="utf-8"; x-default="true" Right now we call qemuValidateDomainDeviceDefControllerUSB() quite late, just as we're generating the QEMU command line. The original intention was likely to prevent configurations from being rejected, even though a default USB controller model could not be found, because using -usb could be used as a last resort. As it turns out, this premise was always flawed: in order for -usb to work, the underlying device still needs to be compiled into QEMU, and if that was the case then the earlier code would have detected its presence and set the model name accordingly. More recently, we have dropped the use of -usb altogether so there's simply no longer anything to fall back to. With all this in mind, we can move the validation step much earlier, making for a better user experience as any issues will be reported when the domain is defined rather than when an attempt is made to start it. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_command.c | 76 +------------------ src/qemu/qemu_validate.c | 76 ++++++++++++++++++- ...ilable-pseries.ppc64-latest.abi-update.xml | 31 -------- ...matic-unavailable-pseries.ppc64-latest.xml | 31 -------- ...ic-unavailable-realview.aarch64-latest.xml | 25 ------ ...-unavailable-versatilepb.armv7l-latest.xml | 27 ------- ...controller-default-isapc.x86_64-latest.err | 2 +- ...controller-default-isapc.x86_64-latest.xml | 26 ------- ...ontroller-default-nousb.aarch64-latest.err | 2 +- ...ontroller-default-nousb.aarch64-latest.xml | 22 ------ ...fault-unavailable-g3beige.ppc64-latest.xml | 27 ------- ...fault-unavailable-i440fx.x86_64-latest.xml | 29 ------- ...default-unavailable-mac99.ppc64-latest.xml | 27 ------- ...efault-unavailable-mac99ppc.ppc-latest.xml | 24 ------ ...ault-unavailable-powernv9.ppc64-latest.xml | 27 ------- ...fault-unavailable-pseries.ppc64-latest.xml | 31 -------- ...-default-unavailable-q35.x86_64-latest.xml | 47 ------------ ...lt-unavailable-realview.aarch64-latest.xml | 25 ------ ...-unavailable-versatilepb.armv7l-latest.xml | 27 ------- ...navailable-virt-aarch64.aarch64-latest.xml | 43 ----------- ...navailable-virt-riscv64.riscv64-latest.xml | 41 ---------- ...ler-nec-xhci-unavailable.x86_64-latest.xml | 33 -------- tests/qemuxmlconftest.c | 36 ++++----- 23 files changed, 97 insertions(+), 638 deletions(-) delete mode 100644 tests/qemuxmlconfdata/usb-controller-automatic-unavaila= ble-pseries.ppc64-latest.abi-update.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-automatic-unavaila= ble-pseries.ppc64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-automatic-unavaila= ble-realview.aarch64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-automatic-unavaila= ble-versatilepb.armv7l-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-isapc.x86_= 64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-nousb.aarc= h64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-g3beige.ppc64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-i440fx.x86_64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-mac99.ppc64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-mac99ppc.ppc-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-powernv9.ppc64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-pseries.ppc64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-q35.x86_64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-realview.aarch64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-versatilepb.armv7l-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-virt-aarch64.aarch64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-unavailabl= e-virt-riscv64.riscv64-latest.xml delete mode 100644 tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailab= le.x86_64-latest.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8efcbdebae..30996ee874 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2558,74 +2558,6 @@ qemuBuildFilesystemCommandLine(virCommand *cmd, } =20 =20 -static int -qemuControllerModelUSBToCaps(int model) -{ - switch (model) { - case VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI: - return QEMU_CAPS_PIIX3_USB_UHCI; - case VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX4_UHCI: - return QEMU_CAPS_PIIX4_USB_UHCI; - case VIR_DOMAIN_CONTROLLER_MODEL_USB_EHCI: - return QEMU_CAPS_USB_EHCI; - case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1: - case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI1: - case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI2: - case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3: - return QEMU_CAPS_ICH9_USB_EHCI1; - case VIR_DOMAIN_CONTROLLER_MODEL_USB_VT82C686B_UHCI: - return QEMU_CAPS_VT82C686B_USB_UHCI; - case VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI: - return QEMU_CAPS_PCI_OHCI; - case VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI: - return QEMU_CAPS_NEC_USB_XHCI; - case VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI: - return QEMU_CAPS_DEVICE_QEMU_XHCI; - default: - return -1; - } -} - - -static int -qemuValidateDomainDeviceDefControllerUSB(const virDomainControllerDef *def, - virQEMUCaps *qemuCaps) -{ - if (def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to determine model for USB controller idx= =3D%1$d"), - def->idx); - return -1; - } - - if (!virDeviceInfoPCIAddressIsPresent(&def->info)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing PCI address for USB controller idx=3D%1$= d"), - def->idx); - return -1; - } - - if (!virQEMUCapsGet(qemuCaps, qemuControllerModelUSBToCaps(def->model)= )) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("USB controller model '%1$s' not supported in thi= s QEMU binary"), - virDomainControllerModelUSBTypeToString(def->model)= ); - return -1; - } - - if (def->opts.usbopts.ports !=3D -1) { - if (def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI && - def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("usb controller type '%1$s' doesn't support '= ports' with this QEMU binary"), - virDomainControllerModelUSBTypeToString(def->mo= del)); - return -1; - } - } - - return 0; -} - - static const char * qemuBuildUSBControllerFindMasterAlias(const virDomainDef *domainDef, const virDomainControllerDef *def) @@ -2653,14 +2585,10 @@ qemuBuildUSBControllerFindMasterAlias(const virDoma= inDef *domainDef, =20 static virJSONValue * qemuBuildUSBControllerDevProps(const virDomainDef *domainDef, - virDomainControllerDef *def, - virQEMUCaps *qemuCaps) + virDomainControllerDef *def) { g_autoptr(virJSONValue) props =3D NULL; =20 - if (qemuValidateDomainDeviceDefControllerUSB(def, qemuCaps) < 0) - return NULL; - if (virJSONValueObjectAdd(&props, "s:driver", qemuControllerModelUSBTypeToStri= ng(def->model), "k:p2", def->opts.usbopts.ports, @@ -2956,7 +2884,7 @@ qemuBuildControllerDevProps(const virDomainDef *domai= nDef, break; =20 case VIR_DOMAIN_CONTROLLER_TYPE_USB: - if (!(props =3D qemuBuildUSBControllerDevProps(domainDef, def, qem= uCaps))) + if (!(props =3D qemuBuildUSBControllerDevProps(domainDef, def))) return -1; =20 break; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index ebcc9b8e8e..5a84ee46b6 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3856,6 +3856,77 @@ qemuValidateDomainDeviceDefControllerSCSI(const virD= omainControllerDef *controll } =20 =20 +static int +qemuControllerModelUSBToCaps(int model) +{ + switch (model) { + case VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI: + return QEMU_CAPS_PIIX3_USB_UHCI; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX4_UHCI: + return QEMU_CAPS_PIIX4_USB_UHCI; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_EHCI: + return QEMU_CAPS_USB_EHCI; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1: + case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI1: + case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI2: + case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3: + return QEMU_CAPS_ICH9_USB_EHCI1; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_VT82C686B_UHCI: + return QEMU_CAPS_VT82C686B_USB_UHCI; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI: + return QEMU_CAPS_PCI_OHCI; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI: + return QEMU_CAPS_NEC_USB_XHCI; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI: + return QEMU_CAPS_DEVICE_QEMU_XHCI; + default: + return -1; + } +} + + +static int +qemuValidateDomainDeviceDefControllerUSB(const virDomainControllerDef *def, + virQEMUCaps *qemuCaps) +{ + if (def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) + return 0; + + if (def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to determine model for USB controller idx= =3D%1$d"), + def->idx); + return -1; + } + + if (!virDeviceInfoPCIAddressIsPresent(&def->info)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing PCI address for USB controller idx=3D%1$= d"), + def->idx); + return -1; + } + + if (!virQEMUCapsGet(qemuCaps, qemuControllerModelUSBToCaps(def->model)= )) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("USB controller model '%1$s' not supported in thi= s QEMU binary"), + virDomainControllerModelUSBTypeToString(def->model)= ); + return -1; + } + + if (def->opts.usbopts.ports !=3D -1) { + if (def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI && + def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("usb controller type '%1$s' doesn't support '= ports' with this QEMU binary"), + virDomainControllerModelUSBTypeToString(def->mo= del)); + return -1; + } + } + + return 0; +} + + /** * virValidateControllerPCIModelNameToQEMUCaps: * @modelName: model name @@ -4525,10 +4596,13 @@ qemuValidateDomainDeviceDefController(const virDoma= inControllerDef *controller, qemuCaps); break; =20 + case VIR_DOMAIN_CONTROLLER_TYPE_USB: + ret =3D qemuValidateDomainDeviceDefControllerUSB(controller, qemuC= aps); + break; + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: - case VIR_DOMAIN_CONTROLLER_TYPE_USB: case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-pse= ries.ppc64-latest.abi-update.xml b/tests/qemuxmlconfdata/usb-controller-aut= omatic-unavailable-pseries.ppc64-latest.abi-update.xml deleted file mode 100644 index 2b71e447e8..0000000000 --- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-pseries.pp= c64-latest.abi-update.xml +++ /dev/null @@ -1,31 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - POWER10 - - - destroy - restart - destroy - - /usr/bin/qemu-system-ppc64 - -
- - - - - -