From nobody Mon Feb 9 16:19:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1560508762; cv=none; d=zoho.com; s=zohoarc; b=JutFyXt7lIynEZJhS0tw02ufvMlgiRYxrOu2Tk8pp/KWibVKzBOiB5YZVkcuLzVlu0NU4A63RHTZhH1ny561s7F5tHa24ChNzplEdzoYOwPmZA1jjFiDM8+Ubt/BTnuVg3WOU1W6Vus5cReoqsUimZGQcG8TMxUhlbftqtq8saI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560508762; 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=gTYgaVxqBRPK8rocmm43NyYO8NMD/RkLQ/i2TLt2MAs=; b=jIER33rYpKIoZCWxMN0njZmGqksICcd6Xq0GtoVOB03h5a/6iF1uTifEXxuO9Q4i2fRnCZJLp4HQHUhlM1PEeAlZNo2UgjEVUkDCs5i9dzDlzd2uMor8opUPQkiG1yQGpYW0ilX+q1Qu3pjoCVjcJazgUuJbhZ3lvSmBbMN8NRo= ARC-Authentication-Results: i=1; mx.zoho.com; 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 1560508762826134.47898365817593; Fri, 14 Jun 2019 03:39:22 -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 1hbjb2-0002l0-Rr; Fri, 14 Jun 2019 10:38:12 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hbjb1-0002kL-1a for xen-devel@lists.xenproject.org; Fri, 14 Jun 2019 10:38:11 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 80b8ba8b-8e90-11e9-8980-bc764e045a96; Fri, 14 Jun 2019 10:38:10 +0000 (UTC) X-Inumbo-ID: 80b8ba8b-8e90-11e9-8980-bc764e045a96 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: Y/hPiyKVrqZU/oDR72x6A/YeAN1mrD78w0H9sgSokHCb5VjCJFkmjwpf+QEwo6K6MMenzqISjP HTri5FEvc48KLcJDdsgE6KHA8LYhkwuPE5VUnXsjxH8O1DbrH7EvCBgPy1nJRczyySGL90lvKx cqLX9lqxrjcN+/bqZEs6YT9Wk6f65/8rA5NDiPwAP8jCfv13EydSqixYezp/eyUiwmx6YT1qTG 9/kc5HBrRFq8gVi0gkRBte/T7m3Dmtacagx62w7V/ckpNF0GqmXBAmjZeMkjcvTJIV3UhTtji3 4s8= X-SBRS: 2.7 X-MesageID: 1722751 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.63,373,1557201600"; d="scan'208";a="1722751" From: Anthony PERARD To: Date: Fri, 14 Jun 2019 11:37:57 +0100 Message-ID: <20190614103801.22619-6-anthony.perard@citrix.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190614103801.22619-1-anthony.perard@citrix.com> References: <20190614103801.22619-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 5/9] libxl_disk: Reorganise 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" This is in preparation of cutting libxl_cdrom_insert into several functions to allow asynchronous callbacks. No functional changes. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- tools/libxl/libxl_disk.c | 58 ++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/tools/libxl/libxl_disk.c b/tools/libxl/libxl_disk.c index bc9e2d5a74..45bf555061 100644 --- a/tools/libxl/libxl_disk.c +++ b/tools/libxl/libxl_disk.c @@ -647,7 +647,7 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, = libxl_device_disk *disk, { AO_CREATE(ctx, domid, ao_how); int num =3D 0, i; - libxl_device_disk *disks =3D NULL, disk_saved, disk_empty; + libxl_device_disk *disks =3D NULL, disk_saved; libxl_domain_config d_config; int rc, dm_ver; libxl__device device; @@ -658,16 +658,9 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid,= libxl_device_disk *disk, flexarray_t *insert =3D NULL, *empty =3D NULL; =20 libxl_domain_config_init(&d_config); - libxl_device_disk_init(&disk_empty); libxl_device_disk_init(&disk_saved); libxl_device_disk_copy(ctx, &disk_saved, disk); =20 - disk_empty.format =3D LIBXL_DISK_FORMAT_EMPTY; - disk_empty.vdev =3D libxl__strdup(NOGC, disk->vdev); - disk_empty.pdev_path =3D libxl__strdup(NOGC, ""); - disk_empty.is_cdrom =3D 1; - libxl__device_disk_setdefault(gc, domid, &disk_empty, false); - libxl_domain_type type =3D libxl__domain_type(gc, domid); if (type =3D=3D LIBXL_DOMAIN_TYPE_INVALID) { rc =3D ERROR_FAIL; @@ -721,23 +714,6 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid,= libxl_device_disk *disk, be_path =3D libxl__device_backend_path(gc, &device); libxl_path =3D libxl__device_libxl_path(gc, &device); =20 - insert =3D flexarray_make(gc, 4, 1); - - flexarray_append_pair(insert, "type", - libxl__device_disk_string_of_backend(disk->backe= nd)); - if (disk->format !=3D LIBXL_DISK_FORMAT_EMPTY) - flexarray_append_pair(insert, "params", - GCSPRINTF("%s:%s", - libxl__device_disk_string_of_format(disk->form= at), - disk->pdev_path)); - else - flexarray_append_pair(insert, "params", ""); - - empty =3D flexarray_make(gc, 4, 1); - flexarray_append_pair(empty, "type", - libxl__device_disk_string_of_backend(disk->backe= nd)); - flexarray_append_pair(empty, "params", ""); - /* Note: CTX lock is already held at this point so lock hierarchy * is maintained. */ @@ -750,11 +726,27 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid= , libxl_device_disk *disk, /* We need to eject the original image first. This is implemented * by inserting empty media. JSON is not updated. */ + if (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, disk->vdev); + disk_empty.pdev_path =3D libxl__strdup(NOGC, ""); + disk_empty.is_cdrom =3D 1; + libxl__device_disk_setdefault(gc, domid, &disk_empty, false); + rc =3D libxl__qmp_insert_cdrom(gc, domid, &disk_empty); + libxl_device_disk_dispose(&disk_empty); if (rc) goto out; } =20 + empty =3D flexarray_make(gc, 4, 1); + flexarray_append_pair(empty, "type", + libxl__device_disk_string_of_backend(disk->backe= nd)); + flexarray_append_pair(empty, "params", ""); + for (;;) { rc =3D libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -781,6 +773,10 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid,= libxl_device_disk *disk, if (rc < 0) goto out; } =20 + /* + * Now that the drive is empty, we can insert the new media. + */ + rc =3D libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; =20 @@ -794,6 +790,17 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid,= libxl_device_disk *disk, if (rc) goto out; } =20 + insert =3D flexarray_make(gc, 4, 1); + flexarray_append_pair(insert, "type", + libxl__device_disk_string_of_backend(disk->backend)); + if (disk->format !=3D LIBXL_DISK_FORMAT_EMPTY) + flexarray_append_pair(insert, "params", + GCSPRINTF("%s:%s", + libxl__device_disk_string_of_format(disk->format), + disk->pdev_path)); + else + flexarray_append_pair(insert, "params", ""); + for (;;) { rc =3D libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -831,7 +838,6 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, = libxl_device_disk *disk, out: libxl__xs_transaction_abort(gc, &t); libxl__device_list_free(&libxl__disk_devtype, disks, num); - libxl_device_disk_dispose(&disk_empty); libxl_device_disk_dispose(&disk_saved); libxl_domain_config_dispose(&d_config); =20 --=20 Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel