From nobody Sun Apr 28 09:06:52 2024 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.zoho.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 1492707446508537.433567947318; Thu, 20 Apr 2017 09:57:26 -0700 (PDT) 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 B1C4575ECB; Thu, 20 Apr 2017 16:57:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B6F1E51DE7; Thu, 20 Apr 2017 16:57:21 +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 6723D18523D1; Thu, 20 Apr 2017 16:57:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v3KGudSi025576 for ; Thu, 20 Apr 2017 12:56:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 867C217AA2; Thu, 20 Apr 2017 16:56:39 +0000 (UTC) Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F42F1796D for ; Thu, 20 Apr 2017 16:56:37 +0000 (UTC) Received: from smtp2.provo.novell.com (smtp2.provo.novell.com [137.65.250.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A87357025 for ; Thu, 20 Apr 2017 16:56:36 +0000 (UTC) Received: from linux-tbji.provo.novell.com (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by smtp2.provo.novell.com with ESMTP (NOT encrypted); Thu, 20 Apr 2017 10:56:25 -0600 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B1C4575ECB Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B1C4575ECB DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0A87357025 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jfehlig@suse.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0A87357025 From: Jim Fehlig To: libvir-list@redhat.com Date: Thu, 20 Apr 2017 10:56:11 -0600 Message-Id: <20170420165611.9909-1-jfehlig@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 203 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 20 Apr 2017 16:56:36 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 20 Apr 2017 16:56:36 +0000 (UTC) for IP:'137.65.250.81' DOMAIN:'smtp2.provo.novell.com' HELO:'smtp2.provo.novell.com' FROM:'jfehlig@suse.com' RCPT:'' X-RedHat-Spam-Score: -1.501 (BAYES_50, RCVD_IN_DNSWL_MED, SPF_PASS) 137.65.250.81 smtp2.provo.novell.com 137.65.250.81 smtp2.provo.novell.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] libxl: add default controllers for USB devices 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.28]); Thu, 20 Apr 2017 16:57:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Attempting to start a domain with USB hostdevs but no USB controllers fails with the rather cryptic error libxl: error: libxl_qmp.c:287:qmp_handle_error_response: received an error message from QMP server: Bus 'xenusb-0.0' not found This can be fixed by creating default USB controllers. When no USB controllers are defined, create the number of 8 port controllers necessary to accommodate the number of defined USB devices. Note that USB controllers are already created as needed in the domainAttachDevice code path. E.g. a USB controller will be created, if necessary, when attaching a USB device with 'virsh attach-device dom usbdev.xml'. Signed-off-by: Jim Fehlig --- src/libxl/libxl_conf.c | 80 +++++++++++++++++++++++++++++++++++++++++++---= ---- 1 file changed, 69 insertions(+), 11 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4bab651b3..ed36dd1ff 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1786,34 +1786,92 @@ libxlMakeUSBController(virDomainControllerDefPtr co= ntroller, } =20 static int +libxlMakeDefaultUSBControllers(virDomainDefPtr def, + libxl_domain_config *d_config) +{ + virDomainControllerDefPtr l_controller =3D NULL; + libxl_device_usbctrl *x_controllers =3D NULL; + size_t nusbdevs =3D 0; + size_t ncontrollers; + size_t i; + + for (i =3D 0; i < def->nhostdevs; i++) { + if (def->hostdevs[i]->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + def->hostdevs[i]->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV= _SUBSYS_TYPE_USB) + nusbdevs++; + } + + /* No controllers needed if there are no USB devs */ + if (nusbdevs =3D=3D 0) + return 0; + + /* Create USB controllers with 8 ports */ + ncontrollers =3D VIR_DIV_UP(nusbdevs, 8); + if (VIR_ALLOC_N(x_controllers, ncontrollers) < 0) + return -1; + + for (i =3D 0; i < ncontrollers; i++) { + if (!(l_controller =3D virDomainControllerDefNew(VIR_DOMAIN_CONTRO= LLER_TYPE_USB))) + goto error; + + l_controller->model =3D VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2; + l_controller->idx =3D i; + l_controller->opts.usbopts.ports =3D 8; + + libxl_device_usbctrl_init(&x_controllers[i]); + + if (libxlMakeUSBController(l_controller, &x_controllers[i]) < 0) + goto error; + + virDomainControllerInsertPreAlloced(def, l_controller); + l_controller =3D NULL; + } + + d_config->usbctrls =3D x_controllers; + d_config->num_usbctrls =3D ncontrollers; + return 0; + + error: + virDomainControllerDefFree(l_controller); + for (i =3D 0; i < ncontrollers; i++) + libxl_device_usbctrl_dispose(&x_controllers[i]); + VIR_FREE(x_controllers); + return -1; +} + +static int libxlMakeUSBControllerList(virDomainDefPtr def, libxl_domain_config *d_con= fig) { virDomainControllerDefPtr *l_controllers =3D def->controllers; size_t ncontrollers =3D def->ncontrollers; size_t nusbctrls =3D 0; libxl_device_usbctrl *x_usbctrls; - size_t i; - - if (ncontrollers =3D=3D 0) - return 0; - - if (VIR_ALLOC_N(x_usbctrls, ncontrollers) < 0) - return -1; + size_t i, j; =20 for (i =3D 0; i < ncontrollers; i++) { + if (l_controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) + nusbctrls++; + } + + if (nusbctrls =3D=3D 0) + return libxlMakeDefaultUSBControllers(def, d_config); + + if (VIR_ALLOC_N(x_usbctrls, nusbctrls) < 0) + return -1; + + for (i =3D 0, j =3D 0; i < ncontrollers && j < nusbctrls; i++) { if (l_controllers[i]->type !=3D VIR_DOMAIN_CONTROLLER_TYPE_USB) continue; =20 - libxl_device_usbctrl_init(&x_usbctrls[nusbctrls]); + libxl_device_usbctrl_init(&x_usbctrls[j]); =20 if (libxlMakeUSBController(l_controllers[i], - &x_usbctrls[nusbctrls]) < 0) + &x_usbctrls[j]) < 0) goto error; =20 - nusbctrls++; + j++; } =20 - VIR_SHRINK_N(x_usbctrls, ncontrollers, ncontrollers - nusbctrls); d_config->usbctrls =3D x_usbctrls; d_config->num_usbctrls =3D nusbctrls; =20 --=20 2.11.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list