From nobody Thu May 15 01:39:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 151243797453119.108110362662273; Mon, 4 Dec 2017 17:39:34 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9EFF65FD40; Tue, 5 Dec 2017 01:39:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B51D61984; Tue, 5 Dec 2017 01:39:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 325FC3D38D; Tue, 5 Dec 2017 01:39:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vB51dJsC029418 for ; Mon, 4 Dec 2017 20:39:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id C0A8117D2C; Tue, 5 Dec 2017 01:39:19 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-84.phx2.redhat.com [10.3.117.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8696F6266C for ; Tue, 5 Dec 2017 01:39:17 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Mon, 4 Dec 2017 20:39:06 -0500 Message-Id: <20171205013907.8563-17-jferlan@redhat.com> In-Reply-To: <20171205013907.8563-1-jferlan@redhat.com> References: <20171205013907.8563-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/17] qemu: Introduce qemuDomainDeviceDefValidateControllerUSB X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 05 Dec 2017 01:39:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move the USB controller validation checs out of qemu_command and into the proper qemu_domain validation helper. We will start slowly and also modity the xml2argv test to change from a RUN to PARSE failure check when the QEMU_CAPS_PIIX3_USB_UHCI is removed. Signed-off-by: John Ferlan --- src/qemu/qemu_command.c | 6 ------ src/qemu/qemu_domain.c | 18 +++++++++++++++++- tests/qemuxml2argvtest.c | 8 ++++---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 56030c482..7ea01e008 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2542,12 +2542,6 @@ qemuBuildUSBControllerDevStr(virDomainControllerDefP= tr def, =20 model =3D def->model; =20 - if (model =3D=3D -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("no model provided for USB controller")); - return -1; - } - smodel =3D qemuControllerModelUSBTypeToString(model); flags =3D qemuControllerModelUSBToCaps(model); =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2e82df4ff..3ab3aa181 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4345,6 +4345,19 @@ qemuDomainDeviceDefValidateControllerSATA(virQEMUCap= sPtr qemuCaps) =20 =20 static int +qemuDomainDeviceDefValidateControllerUSB(const virDomainControllerDef *con= troller) +{ + if (controller->model =3D=3D -1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("no model provided for USB controller")); + return -1; + } + + return 0; +} + + +static int qemuDomainDeviceDefValidateController(const virDomainControllerDef *contro= ller, const virDomainDef *def, virQEMUCapsPtr qemuCaps) @@ -4380,10 +4393,13 @@ qemuDomainDeviceDefValidateController(const virDoma= inControllerDef *controller, ret =3D qemuDomainDeviceDefValidateControllerSATA(qemuCaps); break; =20 + case VIR_DOMAIN_CONTROLLER_TYPE_USB: + ret =3D qemuDomainDeviceDefValidateControllerUSB(controller); + 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_LAST: break; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 385a54615..3fcc76baa 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1508,10 +1508,10 @@ mymain(void) QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_NEC_USB_XHCI); - DO_TEST_FAILURE("usb-controller-default-unavailable-q35", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_NEC_USB_XHCI); + DO_TEST_PARSE_ERROR("usb-controller-default-unavailable-q35", + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_PCI_OHCI, + QEMU_CAPS_NEC_USB_XHCI); DO_TEST("usb-controller-explicit-q35", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_OHCI, --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list