From nobody Mon Feb 9 23:16:16 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=1568891173; cv=none; d=zoho.com; s=zohoarc; b=VyXz09Vo7yu+VEkygf/6gpK2rAtq7RPPTtH3dTTMviQ13YY0LpowXsswaKhrPWPBWgGYz+qU++Hevhd/GhkJujY5LyRAUJqhWM9V0aYlvj4kNmyacVChxSRlKdhkh0gXhAP/fhTHaAMzGyG1eLuc9fxAUJcU9ywyaToo0N512QQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568891173; 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=Er9a3ck0i9IOntUAqVqQwDZROyTACN0UUF2s8LKQePg=; b=VE8l8e+bw4RjYB+/RU+d4BPxYbs5opGaiSv/ZXKoh06dfTQM1OJPwkdMYF+DhroMwmxU+Bpa5Np5xFOZGYrdZRG5T5Vy6e1hgdyAc9lc2A+4YlLJ/7pxEzEvoE3TTCKv5Yfe4UPY4Ng05HFEeSfbr3NblqpTPUPWBuFkty8goiY= 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 15688911739841023.3298660236884; Thu, 19 Sep 2019 04:06: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 1iAuFI-0003KZ-Vv; Thu, 19 Sep 2019 11:05:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iAuFH-0003Ii-1n for xen-devel@lists.xenproject.org; Thu, 19 Sep 2019 11:05:07 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4acd6d32-dacd-11e9-978d-bc764e2007e4; Thu, 19 Sep 2019 11:04:47 +0000 (UTC) X-Inumbo-ID: 4acd6d32-dacd-11e9-978d-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568891087; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KqTbJKINiIo+431UahBxtuHEzMV3isaEDu1HbAroc3E=; b=D1wG/hu+sWCk+qA0R7sfo3SpC/KNcBPufoHElSleDqAnQVg5Lk+8eA94 +YJqZWY97hkMNKA9/m2+6uIjKkP3iNu0+g4NhOByL+YwJvpkaEGv+RDJL dZBdQ5Ya7X81t/CdC/g5QbsWXgOzH2QNwuDOK/CIyfj7I4v3xhvKt7peo 8=; Authentication-Results: esa4.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 (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.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=esa4.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 (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: kQ77wTU15pPUH71gH2pfGXj4GZs9LGzoo37uPjO2O4Zs4uNON8WgCaqIajagEb18viYl0zi9XS 9EQc2YiFOADB17OoJORaa6hd3WIL3HEclPQB6ViaVuz+3Hfahg3GkkwZWVowq9M9v9+1N9ZrM6 3GFFtoGVmGoJ4dzJvEZV1MKfYnY5bFmxBh8NBOwYc97HzlBt4aQLedRI8Px5HtMFUqeCi6YeeN p7d3h1xlIEK3EHJJ9XNPCfuEy6ugwOqyxP2uaB+CaPSABjZZ9cWNujv+taerIzuded1vwn0zvY 6b0= X-SBRS: 2.7 X-MesageID: 6097789 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,523,1559534400"; d="scan'208";a="6097789" From: Anthony PERARD To: Date: Thu, 19 Sep 2019 12:04:43 +0100 Message-ID: <20190919110443.817594-10-anthony.perard@citrix.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919110443.817594-1-anthony.perard@citrix.com> References: <20190919110443.817594-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 9/9] libxl_disk: Use ev_qmp in libxl_cdrom_insert 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) Make libxl_cdrom_insert asynchronous when QEMU is involved. And have the cdrom opened by libxl, sending a file descriptor to QEMU. The "opaque" parameter of the "add-fd" can help to figure out what a fdset in QEMU is used for. It can be queried by "query-fdsets". Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- Notes: v2: - acked - assert that there's no payload_fd before openning a cdrom file - renamed flag `asynchronous_callback' -> `has_callback' tools/libxl/libxl_disk.c | 126 +++++++++++++++++++++++++++-------- tools/libxl/libxl_internal.h | 1 - tools/libxl/libxl_qmp.c | 18 ----- 3 files changed, 100 insertions(+), 45 deletions(-) diff --git a/tools/libxl/libxl_disk.c b/tools/libxl/libxl_disk.c index 5cc215906fcc..05dc9c51f306 100644 --- a/tools/libxl/libxl_disk.c +++ b/tools/libxl/libxl_disk.c @@ -650,14 +650,17 @@ typedef struct { libxl__ev_devlock qmp_lock; int dm_ver; libxl__ev_time time; + libxl__ev_qmp qmp; } libxl__cdrom_insert_state; =20 static void cdrom_insert_lock_acquired(libxl__egc *, libxl__ev_devlock *, int rc); -static void cdrom_insert_ejected(libxl__egc *egc, - libxl__cdrom_insert_state *cis); -static void cdrom_insert_inserted(libxl__egc *egc, - libxl__cdrom_insert_state *cis); +static void cdrom_insert_ejected(libxl__egc *egc, libxl__ev_qmp *, + const libxl__json_object *, int rc); +static void cdrom_insert_addfd_cb(libxl__egc *egc, libxl__ev_qmp *, + const libxl__json_object *, int rc); +static void cdrom_insert_inserted(libxl__egc *egc, libxl__ev_qmp *, + const libxl__json_object *, int rc); static void cdrom_insert_timout(libxl__egc *egc, libxl__ev_time *ev, const struct timeval *requested_abs, int rc); @@ -684,6 +687,10 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid,= libxl_device_disk *disk, cis->qmp_lock.ao =3D ao; cis->qmp_lock.domid =3D domid; libxl__ev_time_init(&cis->time); + libxl__ev_qmp_init(&cis->qmp); + cis->qmp.ao =3D ao; + cis->qmp.domid =3D domid; + cis->qmp.payload_fd =3D -1; =20 libxl_domain_type type =3D libxl__domain_type(gc, domid); if (type =3D=3D LIBXL_DOMAIN_TYPE_INVALID) { @@ -757,26 +764,22 @@ static void cdrom_insert_lock_acquired(libxl__egc *eg= c, LIBXL_HOTPLUG_TIMEOUT * 1000); if (rc) goto out; =20 - /* We need to eject the original image first. This is implemented - * by inserting empty media. JSON is not updated. + /* We need to eject the original image first. + * JSON is not updated. */ =20 if (cis->dm_ver =3D=3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { - libxl_device_disk disk_empty; - - libxl_device_disk_init(&disk_empty); - disk_empty.format =3D LIBXL_DISK_FORMAT_EMPTY; - disk_empty.vdev =3D libxl__strdup(NOGC, cis->disk->vdev); - disk_empty.pdev_path =3D libxl__strdup(NOGC, ""); - disk_empty.is_cdrom =3D 1; - libxl__device_disk_setdefault(gc, cis->domid, &disk_empty, false); + libxl__json_object *args =3D NULL; + int devid =3D libxl__device_disk_dev_number(cis->disk->vdev, + NULL, NULL); =20 - rc =3D libxl__qmp_insert_cdrom(gc, cis->domid, &disk_empty); - libxl_device_disk_dispose(&disk_empty); + QMP_PARAMETERS_SPRINTF(&args, "device", "ide-%i", devid); + cis->qmp.callback =3D cdrom_insert_ejected; + rc =3D libxl__ev_qmp_send(gc, &cis->qmp, "eject", args); if (rc) goto out; + } else { + cdrom_insert_ejected(egc, &cis->qmp, NULL, 0); /* must be last */ } - - cdrom_insert_ejected(egc, cis); /* must be last */ return; =20 out: @@ -784,10 +787,12 @@ static void cdrom_insert_lock_acquired(libxl__egc *eg= c, } =20 static void cdrom_insert_ejected(libxl__egc *egc, - libxl__cdrom_insert_state *cis) + libxl__ev_qmp *qmp, + const libxl__json_object *response, + int rc) { EGC_GC; - int rc; + libxl__cdrom_insert_state *cis =3D CONTAINER_OF(qmp, *cis, qmp); libxl__domain_userdata_lock *data_lock =3D NULL; libxl__device device; const char *be_path, *libxl_path; @@ -795,6 +800,7 @@ static void cdrom_insert_ejected(libxl__egc *egc, xs_transaction_t t =3D XBT_NULL; char *tmp; libxl_domain_config d_config; + bool has_callback =3D false; =20 /* convenience aliases */ libxl_domid domid =3D cis->domid; @@ -802,6 +808,8 @@ static void cdrom_insert_ejected(libxl__egc *egc, =20 libxl_domain_config_init(&d_config); =20 + if (rc) goto out; + rc =3D libxl__device_from_disk(gc, domid, disk, &device); if (rc) goto out; be_path =3D libxl__device_backend_path(gc, &device); @@ -857,9 +865,29 @@ static void cdrom_insert_ejected(libxl__egc *egc, rc =3D libxl__dm_check_start(gc, &d_config, domid); if (rc) goto out; =20 - if (cis->dm_ver =3D=3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { - rc =3D libxl__qmp_insert_cdrom(gc, domid, disk); + if (cis->dm_ver =3D=3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN && + disk->format !=3D LIBXL_DISK_FORMAT_EMPTY) { + libxl__json_object *args =3D NULL; + + assert(qmp->payload_fd =3D=3D -1); + qmp->payload_fd =3D open(disk->pdev_path, O_RDONLY); + if (qmp->payload_fd < 0) { + LOGED(ERROR, domid, "Failed to open cdrom file %s", + disk->pdev_path); + rc =3D ERROR_FAIL; + goto out; + } + + /* This free form parameter is not use by QEMU or libxl. */ + QMP_PARAMETERS_SPRINTF(&args, "opaque", "%s:%s", + libxl_disk_format_to_string(disk->format), + disk->pdev_path); + qmp->callback =3D cdrom_insert_addfd_cb; + rc =3D libxl__ev_qmp_send(gc, qmp, "add-fd", args); if (rc) goto out; + has_callback =3D true; + } else { + has_callback =3D false; } =20 rc =3D 0; @@ -870,16 +898,58 @@ static void cdrom_insert_ejected(libxl__egc *egc, if (data_lock) libxl__unlock_domain_userdata(data_lock); if (rc) { cdrom_insert_done(egc, cis, rc); /* must be last */ - } else { - cdrom_insert_inserted(egc, cis); /* must be last */ + } else if (!has_callback) { + /* Only called if no asynchronous callback are set. */ + cdrom_insert_inserted(egc, qmp, NULL, 0); /* must be last */ + } +} + +static void cdrom_insert_addfd_cb(libxl__egc *egc, + libxl__ev_qmp *qmp, + const libxl__json_object *response, + int rc) +{ + EGC_GC; + libxl__cdrom_insert_state *cis =3D CONTAINER_OF(qmp, *cis, qmp); + libxl__json_object *args =3D NULL; + const libxl__json_object *o; + int devid; + int fdset; + + /* convenience aliases */ + libxl_device_disk *disk =3D cis->disk; + + close(qmp->payload_fd); + qmp->payload_fd =3D -1; + + if (rc) goto out; + + o =3D libxl__json_map_get("fdset-id", response, JSON_INTEGER); + if (!o) { + rc =3D ERROR_FAIL; + goto out; } + fdset =3D libxl__json_object_get_integer(o); + + devid =3D libxl__device_disk_dev_number(disk->vdev, NULL, NULL); + QMP_PARAMETERS_SPRINTF(&args, "device", "ide-%i", devid); + QMP_PARAMETERS_SPRINTF(&args, "target", "/dev/fdset/%d", fdset); + libxl__qmp_param_add_string(gc, &args, "arg", + libxl__qemu_disk_format_string(disk->format)); + qmp->callback =3D cdrom_insert_inserted; + rc =3D libxl__ev_qmp_send(gc, qmp, "change", args); +out: + if (rc) + cdrom_insert_done(egc, cis, rc); /* must be last */ } =20 static void cdrom_insert_inserted(libxl__egc *egc, - libxl__cdrom_insert_state *cis) + libxl__ev_qmp *qmp, + const libxl__json_object *response, + int rc) { EGC_GC; - int rc; + libxl__cdrom_insert_state *cis =3D CONTAINER_OF(qmp, *cis, qmp); libxl__domain_userdata_lock *data_lock =3D NULL; libxl_domain_config d_config; flexarray_t *insert =3D NULL; @@ -894,6 +964,8 @@ static void cdrom_insert_inserted(libxl__egc *egc, =20 libxl_domain_config_init(&d_config); =20 + if (rc) goto out; + rc =3D libxl__device_from_disk(gc, domid, disk, &device); if (rc) goto out; be_path =3D libxl__device_backend_path(gc, &device); @@ -977,6 +1049,8 @@ static void cdrom_insert_done(libxl__egc *egc, EGC_GC; =20 libxl__ev_time_deregister(gc, &cis->time); + libxl__ev_qmp_dispose(gc, &cis->qmp); + if (cis->qmp.payload_fd >=3D 0) close(cis->qmp.payload_fd); libxl__ev_devlock_unlock(gc, &cis->qmp_lock); libxl_device_disk_dispose(&cis->disk_saved); libxl__ao_complete(egc, cis->ao, rc); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e85547e67672..93bf65ee9af8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1960,7 +1960,6 @@ _hidden int libxl__qmp_resume(libxl__gc *gc, int domi= d); _hidden int libxl__qmp_restore(libxl__gc *gc, int domid, const char *filen= ame); /* Set dirty bitmap logging status */ _hidden int libxl__qmp_set_global_dirty_log(libxl__gc *gc, int domid, bool= enable); -_hidden int libxl__qmp_insert_cdrom(libxl__gc *gc, int domid, const libxl_= device_disk *disk); /* Add a virtual CPU */ _hidden int libxl__qmp_cpu_add(libxl__gc *gc, int domid, int index); /* Query the bitmap of CPUs */ diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 693c5d705720..20d9eed8ddc8 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -1118,24 +1118,6 @@ int libxl__qmp_set_global_dirty_log(libxl__gc *gc, i= nt domid, bool enable) NULL, NULL); } =20 -int libxl__qmp_insert_cdrom(libxl__gc *gc, int domid, - const libxl_device_disk *disk) -{ - libxl__json_object *args =3D NULL; - int dev_number =3D libxl__device_disk_dev_number(disk->vdev, NULL, NUL= L); - - QMP_PARAMETERS_SPRINTF(&args, "device", "ide-%i", dev_number); - - if (disk->format =3D=3D LIBXL_DISK_FORMAT_EMPTY) { - return qmp_run_command(gc, domid, "eject", args, NULL, NULL); - } else { - libxl__qmp_param_add_string(gc, &args, "target", disk->pdev_path); - libxl__qmp_param_add_string(gc, &args, "arg", - libxl__qemu_disk_format_string(disk->format)); - return qmp_run_command(gc, domid, "change", args, NULL, NULL); - } -} - int libxl__qmp_cpu_add(libxl__gc *gc, int domid, int idx) { libxl__json_object *args =3D NULL; --=20 Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel