From nobody Mon Feb 9 13:39:25 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=1568914940; cv=none; d=zoho.com; s=zohoarc; b=ENFagSERLMn3fPKd52w428eMvJD3uijOjVksVMXdG/rV7otnYwHRBSE+o5o3gXzrEuLRiFdGwZVatYd92wiWqMeVOHWZpya8UIL/iwtuBEUFlxKhI/uTYTIlv9yVEZl1Zpil90UUApU07ovI7ZDCAzBKMkn9LFCwsSqrmLCM8lU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568914940; 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=JTMug21AG+Xwj/Id8nKVBlSdBIyX5geen5Z9Xjo1xk0=; b=b5TLGytdmaUl9USRNjliKoSByCs9JJZakcVxFxs8ZSOG8pxaNlFWuyfRNDjQ4SLoaYC5sp6xweFz/Qx45Exn48/lPyFsHGGgpyImbyIyceeEFuOFXEfuaBdi3QweN853K9F8G50ipwsxnBCEuX69d6SneqCz0q8Vaowo8GCTAD8= 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 1568914940664415.5243821859724; Thu, 19 Sep 2019 10:42:20 -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 1iB0R1-00053Z-8n; Thu, 19 Sep 2019 17:41:39 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iB0R0-00052A-7H for xen-devel@lists.xenproject.org; Thu, 19 Sep 2019 17:41:38 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id af5d9a7e-db04-11e9-a337-bc764e2007e4; Thu, 19 Sep 2019 17:41:18 +0000 (UTC) X-Inumbo-ID: af5d9a7e-db04-11e9-a337-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568914878; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=riibcUNR+m+jG1WH0pzxicB8ys53JqxoTIyAS95sEgI=; b=HO2SFx1Q5PoF3uAokwvzG7r9CWKdWi4PmWvXe8PkeGpZjgUQjJjmWCwK 103AVjItSbpZtwVPO7fU7+XiLR1v4bR0xZy8gurktm7wvVDPB3mStURoq ZiJ7CETHgvM5YIj7buu9Vm8+4ikwDDGpAI0m20HP7uwNpHuzAQ41MOyRq c=; Authentication-Results: esa5.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 (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.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=esa5.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 (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: cQqwwqlCdmmvTW2Q5v54AyiOPL6G3d3z8rrdbQNbwCm/NgRHewEZggfhpyJflfj07zkL0SdLWg jNjWltAWOGM/DmSgEiJlf653IkzLIwjvebkDzZRr8oBPHu18MAs5vuA49r9PPym1SvR15yQb45 nmyLbXPIhMFEHfS0x2Vebxf/8kd74DxAKRt3AYEYgEMRwfAvViKW6pi47BxUhv5JG7NHc1Z/ey xIWBnrmNEZMcM2rliytUDBBwgxxnEDpaz1yJ9ii3LZWtrhfAqD3QKTny1L8/a0BysEU/Kem3TG xlw= X-SBRS: 2.7 X-MesageID: 6010801 X-Ironport-Server: esa5.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="6010801" From: Anthony PERARD To: Date: Thu, 19 Sep 2019 18:16:43 +0100 Message-ID: <20190919171656.899649-24-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 23/35] libxl: libxl__initiate_device_usbdev_remove now use ev_qmp 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) Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- tools/libxl/libxl_usb.c | 78 +++++++++++++++++++++++++++++++++++------ 1 file changed, 68 insertions(+), 10 deletions(-) diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index 3b432231ea85..1fc7ccf41f86 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -417,18 +417,16 @@ static int libxl__device_usbdev_add_hvm(libxl__gc *gc= , libxl__ev_qmp *qmp, } =20 /* Send qmp commands to delete a usb device in qemu. */ -static int libxl__device_usbdev_del_hvm(libxl__gc *gc, uint32_t domid, +static int libxl__device_usbdev_del_hvm(libxl__gc *gc, libxl__ev_qmp *qmp, libxl_device_usbdev *usbdev) { - flexarray_t *qmp_args; + libxl__json_object *qmp_args =3D NULL; =20 - qmp_args =3D flexarray_make(gc, 2, 1); - flexarray_append_pair(qmp_args, "id", - GCSPRINTF("xenusb-%d-%d", - usbdev->u.hostdev.hostbus, - usbdev->u.hostdev.hostaddr)); + libxl__qmp_param_add_string(gc, &qmp_args, "id", + GCSPRINTF("xenusb-%d-%d", usbdev->u.hostdev.hostbus, + usbdev->u.hostdev.hostaddr)); =20 - return libxl__qmp_run_command_flexarray(gc, domid, "device_del", qmp_a= rgs); + return libxl__ev_qmp_send(gc, qmp, "device_del", qmp_args); } =20 static LIBXL_DEFINE_UPDATE_DEVID(usbctrl) @@ -1866,6 +1864,13 @@ static void device_usbdev_add_done(libxl__egc *egc, LIBXL_DEFINE_DEVICE_ADD(usbdev) static LIBXL_DEFINE_DEVICES_ADD(usbdev) =20 +static void device_usbdev_remove_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs, int rc); +static void device_usbdev_remove_qmp_cb(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *r, int rc); +static void device_usbdev_remove_done(libxl__egc *egc, + libxl__ao_device *aodev, int rc); + /* Operation to remove usb device. * * Generally, it does: @@ -1885,6 +1890,7 @@ static void libxl__device_usbdev_remove(libxl__egc *e= gc, uint32_t domid, int rc; char *busid; libxl_device_usbctrl usbctrl; + bool has_callback =3D false; =20 /* Store *usbdev to be used by callbacks */ aodev->device_config =3D usbdev; @@ -1964,14 +1970,23 @@ static void libxl__device_usbdev_remove(libxl__egc = *egc, uint32_t domid, LIBXL_USBCTRL_TYPE_DEVICEMOD= EL); if (rc) goto out; =20 - rc =3D libxl__device_usbdev_del_hvm(gc, domid, usbdev); + rc =3D libxl__ev_time_register_rel(ao, &aodev->timeout, + device_usbdev_remove_timeout, + LIBXL_QMP_CMD_TIMEOUT * 1000); + if (rc) goto out; + + aodev->qmp.ao =3D ao; + aodev->qmp.domid =3D domid; + aodev->qmp.callback =3D device_usbdev_remove_qmp_cb; + aodev->qmp.payload_fd =3D -1; + rc =3D libxl__device_usbdev_del_hvm(gc, &aodev->qmp, usbdev); if (rc) { libxl__device_usbdev_add_xenstore(gc, domid, usbdev, LIBXL_USBCTRL_TYPE_DEVICEMOD= EL, false); goto out; } - + has_callback =3D true; break; default: LOGD(ERROR, domid, "Unsupported usb controller type"); @@ -1983,6 +1998,49 @@ static void libxl__device_usbdev_remove(libxl__egc *= egc, uint32_t domid, =20 out: libxl_device_usbctrl_dispose(&usbctrl); + /* Only call _done if no callback have been setup */ + if (!has_callback) + device_usbdev_remove_done(egc, aodev, rc); /* must be last */ +} + +static void device_usbdev_remove_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs, int rc) +{ + EGC_GC; + libxl__ao_device *aodev =3D CONTAINER_OF(ev, *aodev, timeout); + + if (rc =3D=3D ERROR_TIMEDOUT) + LOGD(ERROR, aodev->qmp.domid, + "Removing usbdev from QEMU timed out"); + device_usbdev_remove_qmp_cb(egc, &aodev->qmp, NULL, rc); +} + +static void device_usbdev_remove_qmp_cb(libxl__egc *egc, + libxl__ev_qmp *qmp, + const libxl__json_object *r, + int rc) +{ + EGC_GC; + libxl__ao_device *aodev =3D CONTAINER_OF(qmp, *aodev, qmp); + libxl_device_usbdev *const usbdev =3D aodev->device_config; + + if (rc) { + libxl__device_usbdev_add_xenstore(gc, qmp->domid, usbdev, + LIBXL_USBCTRL_TYPE_DEVICEMODEL, + false); + } + + device_usbdev_remove_done(egc, aodev, rc); /* must be last */ +} + +static void device_usbdev_remove_done(libxl__egc *egc, + libxl__ao_device *aodev, + int rc) +{ + EGC_GC; + + libxl__ev_time_deregister(gc, &aodev->timeout); + libxl__ev_qmp_dispose(gc, &aodev->qmp); aodev->rc =3D rc; aodev->callback(egc, aodev); } --=20 Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel