From patchwork Fri Jun 14 11:24:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 10995107 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 862611395 for ; Fri, 14 Jun 2019 11:29:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76A7B285B5 for ; Fri, 14 Jun 2019 11:29:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 688B9285B3; Fri, 14 Jun 2019 11:29:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DE8C0283B2 for ; Fri, 14 Jun 2019 11:29:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hbkNG-00006r-PJ; Fri, 14 Jun 2019 11:28:02 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hbkNG-00006S-2B for xen-devel@lists.xenproject.org; Fri, 14 Jun 2019 11:28:02 +0000 X-Inumbo-ID: 76357622-8e97-11e9-a6ab-07f56f5bfeb1 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 76357622-8e97-11e9-a6ab-07f56f5bfeb1; Fri, 14 Jun 2019 11:27:59 +0000 (UTC) Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa1.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa1.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa1.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: VkyxnMKZ5uiISRo8Z3I3ELlzeAoB8sS4FfEKdmJdYjz44Zkg+NFGEPbnwDtOZZ/+e/a/eu6E/4 eK34fj68eAm4GMNsmHQCHyV0H7LOiaOOdEy+GZABWg2q1798pReltQkMi+6SyLTYGRs6pfv5DS xbvl0GRkFZge9Lzu/12YNn7GiGVMZzWx/Lk9h3+sVh2JrjhaZvoMIhBEmpCEuWx8gpU5whySXU dF0XSylE3vHMaJPdTUzy7GFUBAPsOGPA+iOOLMYD5YysqPW/weeBTFnsbfOVe0DmEwELe+e+VI d1k= X-SBRS: 2.7 X-MesageID: 1754071 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,373,1557201600"; d="scan'208";a="1754071" From: Anthony PERARD To: Date: Fri, 14 Jun 2019 12:24:44 +0100 Message-ID: <20190614112444.29980-16-anthony.perard@citrix.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190614112444.29980-1-anthony.perard@citrix.com> References: <20190614112444.29980-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 15/15] libxl_usb: Use usbctrl instead of usbctrlinfo X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Anthony PERARD , Ian Jackson , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The functions that calls usbctrl_getinfo() only needs information that can be found in a `libxl_device_usbctrl'. So avoid calling libxl_device_usbctrl_getinfo and call libxl_devid_to_device_usbctrl instead. (libxl_device_usbctrl_getinfo needs a `libxl_device_usbctrl' anyway.) Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- tools/libxl/libxl_usb.c | 49 +++++++++++------------------------------ 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index de49f8620c..3d69379c20 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -518,13 +518,10 @@ void libxl__initiate_device_usbctrl_remove(libxl__egc *egc, uint32_t domid = aodev->dev->domid; int usbctrl_devid = aodev->dev->devid; libxl_device_usbctrl usbctrl; - libxl_usbctrlinfo usbctrlinfo; libxl_device_usbctrl_init(&usbctrl); - libxl_usbctrlinfo_init(&usbctrlinfo); - usbctrl.devid = usbctrl_devid; - - rc = libxl_device_usbctrl_getinfo(CTX, domid, &usbctrl, &usbctrlinfo); + rc = libxl_devid_to_device_usbctrl(CTX, domid, usbctrl_devid, + &usbctrl); if (rc) goto out; /* Remove usb devices first */ @@ -541,7 +538,7 @@ void libxl__initiate_device_usbctrl_remove(libxl__egc *egc, } } - if (usbctrlinfo.type == LIBXL_USBCTRL_TYPE_DEVICEMODEL) { + if (usbctrl.type == LIBXL_USBCTRL_TYPE_DEVICEMODEL) { rc = libxl__device_usbctrl_del_hvm(gc, domid, usbctrl_devid); if (!rc) libxl__device_usbctrl_del_xenstore(gc, domid, &usbctrl); @@ -549,7 +546,6 @@ void libxl__initiate_device_usbctrl_remove(libxl__egc *egc, } libxl_device_usbctrl_dispose(&usbctrl); - libxl_usbctrlinfo_dispose(&usbctrlinfo); /* Remove usbctrl */ libxl__initiate_device_generic_remove(egc, aodev); @@ -557,7 +553,6 @@ void libxl__initiate_device_usbctrl_remove(libxl__egc *egc, out: libxl_device_usbctrl_dispose(&usbctrl); - libxl_usbctrlinfo_dispose(&usbctrlinfo); aodev->rc = rc; aodev->callback(egc, aodev); return; @@ -1531,16 +1526,12 @@ static int do_usbdev_add(libxl__gc *gc, uint32_t domid, int rc; char *busid; libxl_device_usbctrl usbctrl; - libxl_usbctrlinfo usbctrlinfo; libxl_device_usbctrl_init(&usbctrl); - libxl_usbctrlinfo_init(&usbctrlinfo); - usbctrl.devid = usbdev->ctrl; - - rc = libxl_device_usbctrl_getinfo(CTX, domid, &usbctrl, &usbctrlinfo); + rc = libxl_devid_to_device_usbctrl(CTX, domid, usbdev->ctrl, &usbctrl); if (rc) goto out; - switch (usbctrlinfo.type) { + switch (usbctrl.type) { case LIBXL_USBCTRL_TYPE_PV: busid = usbdev_busaddr_to_busid(gc, usbdev->u.hostdev.hostbus, usbdev->u.hostdev.hostaddr); @@ -1591,7 +1582,6 @@ static int do_usbdev_add(libxl__gc *gc, uint32_t domid, out: libxl_device_usbctrl_dispose(&usbctrl); - libxl_usbctrlinfo_dispose(&usbctrlinfo); return rc; } @@ -1620,21 +1610,19 @@ static void libxl__device_usbdev_add(libxl__egc *egc, uint32_t domid, libxl_device_usbdev *assigned; int num_assigned; libxl_device_usbctrl usbctrl; - libxl_usbctrlinfo usbctrlinfo; libxl_device_usbctrl_init(&usbctrl); - libxl_usbctrlinfo_init(&usbctrlinfo); /* Currently only support adding USB device from Dom0 backend. * So, if USB controller is specified, check its backend domain, * if it's not Dom0, report error. */ if (usbdev->ctrl != -1) { - usbctrl.devid = usbdev->ctrl; - rc = libxl_device_usbctrl_getinfo(CTX, domid, &usbctrl, &usbctrlinfo); + rc = libxl_devid_to_device_usbctrl(CTX, domid, usbdev->ctrl, + &usbctrl); if (rc) goto out; - if (usbctrlinfo.backend_id != LIBXL_TOOLSTACK_DOMID) { + if (usbctrl.backend_domid != LIBXL_TOOLSTACK_DOMID) { LOGD(ERROR, domid, "Don't support adding USB device from non-Dom0 backend"); rc = ERROR_INVAL; @@ -1674,7 +1662,6 @@ static void libxl__device_usbdev_add(libxl__egc *egc, uint32_t domid, out: libxl_device_usbctrl_dispose(&usbctrl); - libxl_usbctrlinfo_dispose(&usbctrlinfo); aodev->rc = rc; aodev->callback(egc, aodev); return; @@ -1689,18 +1676,14 @@ static int do_usbdev_remove(libxl__gc *gc, uint32_t domid, int rc; char *busid; libxl_device_usbctrl usbctrl; - libxl_usbctrlinfo usbctrlinfo; libxl_device_usbctrl_init(&usbctrl); - libxl_usbctrlinfo_init(&usbctrlinfo); - usbctrl.devid = usbdev->ctrl; - - rc = libxl_device_usbctrl_getinfo(CTX, domid, &usbctrl, &usbctrlinfo); + rc = libxl_devid_to_device_usbctrl(CTX, domid, usbdev->ctrl, &usbctrl); if (rc) goto out; - switch (usbctrlinfo.type) { + switch (usbctrl.type) { case LIBXL_USBCTRL_TYPE_PV: - busid = usbdev_busid_from_ctrlport(gc, domid, usbdev, usbctrlinfo.type); + busid = usbdev_busid_from_ctrlport(gc, domid, usbdev, usbctrl.type); if (!busid) { rc = ERROR_FAIL; goto out; @@ -1772,7 +1755,6 @@ static int do_usbdev_remove(libxl__gc *gc, uint32_t domid, out: libxl_device_usbctrl_dispose(&usbctrl); - libxl_usbctrlinfo_dispose(&usbctrlinfo); return rc; } @@ -1787,7 +1769,6 @@ static int do_usbdev_remove(libxl__gc *gc, uint32_t domid, static int libxl__device_usbdev_remove(libxl__gc *gc, uint32_t domid, libxl_device_usbdev *usbdev) { - libxl_usbctrlinfo usbctrlinfo; libxl_device_usbctrl usbctrl; int rc; @@ -1797,13 +1778,10 @@ static int libxl__device_usbdev_remove(libxl__gc *gc, uint32_t domid, } libxl_device_usbctrl_init(&usbctrl); - libxl_usbctrlinfo_init(&usbctrlinfo); - usbctrl.devid = usbdev->ctrl; - - rc = libxl_device_usbctrl_getinfo(CTX, domid, &usbctrl, &usbctrlinfo); + rc = libxl_devid_to_device_usbctrl(CTX, domid, usbdev->ctrl, &usbctrl); if (rc) goto out; - if (usbctrlinfo.backend_id != LIBXL_TOOLSTACK_DOMID) { + if (usbctrl.backend_domid != LIBXL_TOOLSTACK_DOMID) { LOGD(ERROR, domid, "Don't support removing USB device from non-Dom0 backend"); rc = ERROR_INVAL; @@ -1815,7 +1793,6 @@ static int libxl__device_usbdev_remove(libxl__gc *gc, uint32_t domid, out: libxl_device_usbctrl_dispose(&usbctrl); - libxl_usbctrlinfo_dispose(&usbctrlinfo); return rc; }