From nobody Mon Feb 9 15:11:17 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=1568914929; cv=none; d=zoho.com; s=zohoarc; b=Gv9ilQTXYyDI3hcLk+ICh78HxcxS5Y3vx+a2l2g0fbiRZHvQUtA3V7FRt2YzpJYl6JKiMbHry/k/PxvRuYgMxT0XWfS8fG54W5ld5porbnYD5G/bBR0oVaF9R3S2n3Ny1nbkEDTI0be+APOrTrd3fKkDi4JSDcJ/SAQ4iYRaz9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568914929; 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=xAN7yCsRnLaTe9hOKChlNNs9RMoOAnbZf3lAuscWlOk=; b=UcL5fM1lODC7ZvhONKBb0NH63ipAFKjFz6ym5uXlGT+yDBWYagmUIoL9+pUu3T/Kan1VqW2lEY18BsF1F6KW4Uz6grgT/1hJOdokHJh6DyXLt8KFH+NNvYnQqoZg5kgOoO5AzH4DwQgOckFPBvcb8KeGXXCc0WU3Uf9HO7BpCRc= 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 1568914929143551.0307827188838; Thu, 19 Sep 2019 10:42:09 -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 1iB0QZ-0004SK-JL; Thu, 19 Sep 2019 17:41:11 +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 1iB0QY-0004Qi-A9 for xen-devel@lists.xenproject.org; Thu, 19 Sep 2019 17:41:10 +0000 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a3fb4d49-db04-11e9-966e-12813bfff9fa; Thu, 19 Sep 2019 17:40:59 +0000 (UTC) X-Inumbo-ID: a3fb4d49-db04-11e9-966e-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568914859; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=A3sIvBA7sFb7p5UsgHgoKIZqd18mZ4P0465g6VAmMw4=; b=VswSrIpCzOdi13kjg37aPYrOPweiUvmy/G62iBP4D382EqA4KQdcFkkT 64AN48eOklCapShwed/gThdbaD4QHk1YqFLd2fLU+5lmNHAY4/Mnj5gTq dcDBxCc7BRWpzErG8aW0OdpUwtOxj8POk/MMjWd9DQzQrt0mCmhXeo0ZD w=; Authentication-Results: esa2.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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.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=esa2.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 (esa2.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=esa2.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: POvbL7taZ8ztiS04bu8pJB+ctWspmmpiZ4iwjtTxJcmBS9SbJSBLk9SYQ2zX16e+k2+VKxAPW9 sqCh/ajcIfXxZzUnxPefc1Y0yMJGr2h+sW5gktjSSlsBg5zyxCzGsP2cXuSUlgXzkRt1wApd7t n5p2wi5NpFPn3SQXZC5xLYCv5+4ygwRhLGZr1Qi6jFPM3WYYxKygZ09OP7NdsWudBG1eCPaHB7 G3eaKRvKl3nsFJM6iP7cyQ+cJRaZ4p2vo56WGm6p4hcUvYyR3bbHzwAAFUrzl0mG8df7Kf5A4O kf0= X-SBRS: 2.7 X-MesageID: 5801777 X-Ironport-Server: esa2.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="5801777" From: Anthony PERARD To: Date: Thu, 19 Sep 2019 18:16:39 +0100 Message-ID: <20190919171656.899649-20-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 19/35] libxl_usb: Make libxl__device_usbctrl_add uses 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 | 93 ++++++++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index de8122dc57e9..506dbdcf5ee4 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -349,33 +349,36 @@ static char *pvusb_get_device_type(libxl_usbctrl_type= type) * - usb-ehci (version=3D2), always 6 ports * - nec-usb-xhci (version=3D3), up to 15 ports */ -static int libxl__device_usbctrl_add_hvm(libxl__gc *gc, uint32_t domid, +static int libxl__device_usbctrl_add_hvm(libxl__gc *gc, libxl__ev_qmp *qmp, libxl_device_usbctrl *usbctrl) { - flexarray_t *qmp_args; - - qmp_args =3D flexarray_make(gc, 8, 1); + libxl__json_object *qmp_args =3D NULL; =20 switch (usbctrl->version) { case 1: - flexarray_append_pair(qmp_args, "driver", "piix3-usb-uhci"); + libxl__qmp_param_add_string(gc, &qmp_args, + "driver", "piix3-usb-uhci"); break; case 2: - flexarray_append_pair(qmp_args, "driver", "usb-ehci"); + libxl__qmp_param_add_string(gc, &qmp_args, + "driver", "usb-ehci"); break; case 3: - flexarray_append_pair(qmp_args, "driver", "nec-usb-xhci"); - flexarray_append_pair(qmp_args, "p2", GCSPRINTF("%d", usbctrl->por= ts)); - flexarray_append_pair(qmp_args, "p3", GCSPRINTF("%d", usbctrl->por= ts)); + libxl__qmp_param_add_string(gc, &qmp_args, + "driver", "nec-usb-xhci"); + libxl__qmp_param_add_string(gc, &qmp_args, "p2", + GCSPRINTF("%d", usbctrl->ports)); + libxl__qmp_param_add_string(gc, &qmp_args, "p3", + GCSPRINTF("%d", usbctrl->ports)); break; default: abort(); /* Should not be possible. */ } =20 - flexarray_append_pair(qmp_args, "id", - GCSPRINTF("xenusb-%d", usbctrl->devid)); + libxl__qmp_param_add_string(gc, &qmp_args, "id", + GCSPRINTF("xenusb-%d", usbctrl->devid)); =20 - return libxl__qmp_run_command_flexarray(gc, domid, "device_add", qmp_a= rgs); + return libxl__ev_qmp_send(gc, qmp, "device_add", qmp_args); } =20 /* Send qmp commands to delete a usb controller in qemu. */ @@ -430,6 +433,13 @@ static int libxl__device_usbdev_del_hvm(libxl__gc *gc,= uint32_t domid, =20 static LIBXL_DEFINE_UPDATE_DEVID(usbctrl) =20 +static void device_usbctrl_add_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs, int rc); +static void device_usbctrl_add_qmp_cb(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *r, int rc); +static void device_usbctrl_add_done(libxl__egc *egc, + libxl__ao_device *aodev, int rc); + /* AO operation to add a usb controller. * * Generally, it does: @@ -450,6 +460,10 @@ static void libxl__device_usbctrl_add(libxl__egc *egc,= uint32_t domid, libxl__device *device; int rc; =20 + /* Store *usbctrl to be used by callbacks */ + aodev->device_config =3D usbctrl; + aodev->device_type =3D &libxl__usbctrl_devtype; + rc =3D libxl__device_usbctrl_setdefault(gc, domid, usbctrl, aodev->update_json); if (rc < 0) goto out; @@ -464,14 +478,25 @@ static void libxl__device_usbctrl_add(libxl__egc *egc= , uint32_t domid, GCNEW(device); rc =3D libxl__device_from_usbctrl(gc, domid, usbctrl, device); if (rc) goto outrm; + aodev->dev =3D device; =20 if (device->backend_kind =3D=3D LIBXL__DEVICE_KIND_NONE) { - rc =3D libxl__device_usbctrl_add_hvm(gc, domid, usbctrl); + libxl__ev_qmp *const qmp =3D &aodev->qmp; + + rc =3D libxl__ev_time_register_rel(ao, &aodev->timeout, + device_usbctrl_add_timeout, + LIBXL_QMP_CMD_TIMEOUT * 1000); if (rc) goto outrm; - goto out; + + qmp->ao =3D ao; + qmp->domid =3D domid; + qmp->payload_fd =3D -1; + qmp->callback =3D device_usbctrl_add_qmp_cb; + rc =3D libxl__device_usbctrl_add_hvm(gc, qmp, usbctrl); + if (rc) goto outrm; + return; } =20 - aodev->dev =3D device; aodev->action =3D LIBXL__DEVICE_ACTION_ADD; libxl__wait_device_connection(egc, aodev); return; @@ -479,9 +504,45 @@ static void libxl__device_usbctrl_add(libxl__egc *egc,= uint32_t domid, outrm: libxl__device_usbctrl_del_xenstore(gc, domid, usbctrl); out: + device_usbctrl_add_done(egc, aodev, rc); +} + +static void device_usbctrl_add_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->dev->domid, "Adding usbctrl to QEMU timed out"); + device_usbctrl_add_qmp_cb(egc, &aodev->qmp, NULL, rc); +} + +static void device_usbctrl_add_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_usbctrl *const usbctrl =3D aodev->device_config; + + if (rc) + libxl__device_usbctrl_del_xenstore(gc, aodev->dev->domid, usbctrl); + + device_usbctrl_add_done(egc, aodev, rc); +} + +static void device_usbctrl_add_done(libxl__egc *egc, + libxl__ao_device *aodev, + int rc) +{ + EGC_GC; + libxl__ev_qmp_dispose(gc, &aodev->qmp); + libxl__ev_time_deregister(gc, &aodev->timeout); aodev->rc =3D rc; aodev->callback(egc, aodev); - return; } =20 LIBXL_DEFINE_DEVICE_ADD(usbctrl) --=20 Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel