From nobody Tue Feb 10 04:03:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1568914933; cv=none; d=zoho.com; s=zohoarc; b=TtHMIY9vhPbqbhIFTsN6Lga5re1G3FUpEirfI+KdPrK75ejYDrl8rOrqpE0wPB91yifIofwKTErqV7Dao3ivJ0T3QfgDGW1IRpt2v+FALQWJttIo/X6TIv1tCoaGCbeP6DHH9HxV+i/NyEArTqqXGRPkeDb6EYHrgXEl3wq5gl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568914933; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=IMtG2yyhu2TwWG1nTL617jyNTUEAm2Wlr9MC3KixIoQ=; b=nxqWzLp0mDAZPIzQIyfR8+dUAMCXMSsU3rGO7ZMZmv3uY/PZOOZ7dKXiDZHMooxtfmIt1F5BhNPBgj2VbuRa9Mhsk71Pv95MJXEY1q1g4vBVm+pw7iHVy+AMzkwkPNNhDcR2AvgfG3ltOz+g3FBR21udiryXfA3lhciOfieCGSo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1568914933247562.1863644319404; Thu, 19 Sep 2019 10:42:13 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iB0Qv-0004uo-Lm; Thu, 19 Sep 2019 17:41:33 +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 1iB0Qu-0004sW-1c for xen-devel@lists.xenproject.org; Thu, 19 Sep 2019 17:41:32 +0000 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b1045cf0-db04-11e9-966e-12813bfff9fa; Thu, 19 Sep 2019 17:41:21 +0000 (UTC) X-Inumbo-ID: b1045cf0-db04-11e9-966e-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568914881; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lfU5Lz9mC5Tpd9BlxCQdv6MV7HYJTHP2JVQj7+pdKFg=; b=FSZrTQRB33AYJ01cegQ/bfAw2N17sx08luAWBpWtcKDXrdbrfxVBGwMz EA9OflHEVUL3aFy9bqR2hbgsbyZC74o+l8e5KfCIYR5jsXer+hTQk4vtg EHNosuQMCvO539pcSKoDSJbHDkoOt0tbytHceL8dsNN+ChZrPMZ2QIqFO s=; 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 (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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: /in4ZC5diqKIdnFufZDqeyk9EiNtkTXWxCwsYpCwOtwcf7lKbAX0WIpSaBU/x7Hdn22MgT4Ds2 yU9B3BB+lEUUlXTwO6focBnVHLO1fH6pPdsI2Ry5w/qMuUfTLkmz3UC6LQWNj8JZr1FopNAqoI T2ww3iKm8pt22i8OSuZII3b6SpaYcLkmDj58Aej7wzUQEKZmTVwTEho4dT8hJcY8m1o4UtZZbN eeGlG2cG3dOMfyhZAPJ/fcMs70tMduF8+TnXNoKI5XaiEFA7wNdTf/H/Tg2H3Ls1U1EhjQ6klq nnE= X-SBRS: 2.7 X-MesageID: 5864921 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.64,524,1559534400"; d="scan'208";a="5864921" From: Anthony PERARD To: Date: Thu, 19 Sep 2019 18:16:36 +0100 Message-ID: <20190919171656.899649-17-anthony.perard@citrix.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919171656.899649-1-anthony.perard@citrix.com> References: <20190919171656.899649-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 16/35] libxl: Inline do_usbdev_remove into libxl__device_usbdev_remove 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Having the function do_usbdev_remove makes it harder to add asynchronous calls into it. Move its body back into libxl__device_usbdev_remove and adjust the latter as there are no reason to have a separated function. No functional changes. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- tools/libxl/libxl_usb.c | 63 +++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index 0da7a725a720..de8122dc57e9 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -1653,17 +1653,38 @@ static void libxl__device_usbdev_add(libxl__egc *eg= c, uint32_t domid, LIBXL_DEFINE_DEVICE_ADD(usbdev) static LIBXL_DEFINE_DEVICES_ADD(usbdev) =20 -static int do_usbdev_remove(libxl__gc *gc, uint32_t domid, - libxl_device_usbdev *usbdev) +/* Operation to remove usb device. + * + * Generally, it does: + * 1) check if the usb device is assigned to the domain + * 2) remove the usb device from xenstore controller/port. + * 3) unbind usb device from usbback and rebind to its original driver. + * If usb device has many interfaces, do it to each interface. + */ +static int libxl__device_usbdev_remove(libxl__gc *gc, uint32_t domid, + libxl_device_usbdev *usbdev) { int rc; char *busid; libxl_device_usbctrl usbctrl; =20 + if (usbdev->ctrl < 0 || usbdev->port < 1) { + LOGD(ERROR, domid, "Invalid USB device"); + return ERROR_FAIL; + } + libxl_device_usbctrl_init(&usbctrl); rc =3D libxl_devid_to_device_usbctrl(CTX, domid, usbdev->ctrl, &usbctr= l); if (rc) goto out; =20 + if (usbctrl.backend_domid !=3D LIBXL_TOOLSTACK_DOMID) { + LOGD(ERROR, domid, + "Don't support removing USB device from non-Dom0 backend"); + rc =3D ERROR_INVAL; + goto out; + } + + /* do actual removing usb device operation */ switch (usbctrl.type) { case LIBXL_USBCTRL_TYPE_PV: busid =3D usbdev_busid_from_ctrlport(gc, domid, usbdev, usbctrl.ty= pe); @@ -1741,44 +1762,6 @@ static int do_usbdev_remove(libxl__gc *gc, uint32_t = domid, return rc; } =20 -/* Operation to remove usb device. - * - * Generally, it does: - * 1) check if the usb device is assigned to the domain - * 2) remove the usb device from xenstore controller/port. - * 3) unbind usb device from usbback and rebind to its original driver. - * If usb device has many interfaces, do it to each interface. - */ -static int libxl__device_usbdev_remove(libxl__gc *gc, uint32_t domid, - libxl_device_usbdev *usbdev) -{ - libxl_device_usbctrl usbctrl; - int rc; - - if (usbdev->ctrl < 0 || usbdev->port < 1) { - LOGD(ERROR, domid, "Invalid USB device"); - return ERROR_FAIL; - } - - libxl_device_usbctrl_init(&usbctrl); - rc =3D libxl_devid_to_device_usbctrl(CTX, domid, usbdev->ctrl, &usbctr= l); - if (rc) goto out; - - if (usbctrl.backend_domid !=3D LIBXL_TOOLSTACK_DOMID) { - LOGD(ERROR, domid, - "Don't support removing USB device from non-Dom0 backend"); - rc =3D ERROR_INVAL; - goto out; - } - - /* do actual removing usb device operation */ - rc =3D do_usbdev_remove(gc, domid, usbdev); - -out: - libxl_device_usbctrl_dispose(&usbctrl); - return rc; -} - int libxl_device_usbdev_remove(libxl_ctx *ctx, uint32_t domid, libxl_device_usbdev *usbdev, const libxl_asyncop_how *ao_how) --=20 Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel