From nobody Mon May 6 03:45:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152087386409843.42980019782908; Mon, 12 Mar 2018 09:57:44 -0700 (PDT) Received: from localhost ([::1]:33226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evQlb-0008BJ-74 for importer@patchew.org; Mon, 12 Mar 2018 12:57:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evQjg-0006ux-Sz for qemu-devel@nongnu.org; Mon, 12 Mar 2018 12:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evQjf-0006hc-KR for qemu-devel@nongnu.org; Mon, 12 Mar 2018 12:55:44 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55940 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1evQja-0006cn-OI; Mon, 12 Mar 2018 12:55:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 851A94072450; Mon, 12 Mar 2018 16:55:36 +0000 (UTC) Received: from localhost (ovpn-204-146.brq.redhat.com [10.40.204.146]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0BA5F2166BB2; Mon, 12 Mar 2018 16:55:35 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 12 Mar 2018 17:55:26 +0100 Message-Id: <20180312165528.8969-2-mreitz@redhat.com> In-Reply-To: <20180312165528.8969-1-mreitz@redhat.com> References: <20180312165528.8969-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 12 Mar 2018 16:55:36 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 12 Mar 2018 16:55:36 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mreitz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/3] vdi: Pull option parsing from vdi_co_create X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefan Weil , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In preparation of QAPI-fying VDI image creation, we have to create a BlockdevCreateOptionsVdi type which is received by a (future) vdi_co_create(). vdi_co_create_opts() now converts the QemuOpts object into such a BlockdevCreateOptionsVdi object. The protocol-layer file is still created in vdi_co_do_create() (and BlockdevCreateOptionsVdi.file is set to an empty string), but that will be addressed by a follow-up patch. Note that cluster-size is not part of the QAPI schema because it is not supported by default. Signed-off-by: Max Reitz --- qapi/block-core.json | 18 +++++++++++ block/vdi.c | 91 ++++++++++++++++++++++++++++++++++++++++++++----= ---- 2 files changed, 95 insertions(+), 14 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 524d51567a..e7110c9a47 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -3606,6 +3606,24 @@ 'data': { 'location': 'BlockdevOptionsSsh', 'size': 'size' } } =20 +## +# @BlockdevCreateOptionsVdi: +# +# Driver specific image creation options for VDI. +# +# @file Node to create the image format on +# @size Size of the virtual disk in bytes +# @static Whether to create a statically (true) or +# dynamically (false) allocated image +# (default: false, i.e. dynamic) +# +# Since: 2.12 +## +{ 'struct': 'BlockdevCreateOptionsVdi', + 'data': { 'file': 'BlockdevRef', + 'size': 'size', + '*static': 'bool' } } + ## # @BlockdevCreateNotSupported: # diff --git a/block/vdi.c b/block/vdi.c index 2b5ddd0666..0c8f8204ce 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -51,6 +51,9 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qobject-input-visitor.h" +#include "qapi/qapi-visit-block-core.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" @@ -140,6 +143,8 @@ #define VDI_DISK_SIZE_MAX ((uint64_t)VDI_BLOCKS_IN_IMAGE_MAX * \ (uint64_t)DEFAULT_CLUSTER_SIZE) =20 +static QemuOptsList vdi_create_opts; + typedef struct { char text[0x40]; uint32_t signature; @@ -716,13 +721,14 @@ nonallocating_write: return ret; } =20 -static int coroutine_fn vdi_co_create_opts(const char *filename, QemuOpts = *opts, - Error **errp) +static int coroutine_fn vdi_co_do_create(const char *filename, + QemuOpts *file_opts, + BlockdevCreateOptionsVdi *vdi_opt= s, + size_t block_size, Error **errp) { int ret =3D 0; uint64_t bytes =3D 0; uint32_t blocks; - size_t block_size =3D DEFAULT_CLUSTER_SIZE; uint32_t image_type =3D VDI_TYPE_DYNAMIC; VdiHeader header; size_t i; @@ -735,18 +741,25 @@ static int coroutine_fn vdi_co_create_opts(const char= *filename, QemuOpts *opts, logout("\n"); =20 /* Read out options. */ - bytes =3D ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0), - BDRV_SECTOR_SIZE); -#if defined(CONFIG_VDI_BLOCK_SIZE) - /* TODO: Additional checks (SECTOR_SIZE * 2^n, ...). */ - block_size =3D qemu_opt_get_size_del(opts, - BLOCK_OPT_CLUSTER_SIZE, - DEFAULT_CLUSTER_SIZE); -#endif -#if defined(CONFIG_VDI_STATIC_IMAGE) - if (qemu_opt_get_bool_del(opts, BLOCK_OPT_STATIC, false)) { + bytes =3D vdi_opts->size; + if (vdi_opts->q_static) { image_type =3D VDI_TYPE_STATIC; } +#ifndef CONFIG_VDI_STATIC_IMAGE + if (image_type =3D=3D VDI_TYPE_STATIC) { + ret =3D -ENOTSUP; + error_setg(errp, "Statically allocated images cannot be created in= " + "this build"); + goto exit; + } +#endif +#ifndef CONFIG_VDI_BLOCK_SIZE + if (block_size !=3D DEFAULT_CLUSTER_SIZE) { + ret =3D -ENOTSUP; + error_setg(errp, + "A non-default cluster size is not supported in this bu= ild"); + goto exit; + } #endif =20 if (bytes > VDI_DISK_SIZE_MAX) { @@ -757,7 +770,7 @@ static int coroutine_fn vdi_co_create_opts(const char *= filename, QemuOpts *opts, goto exit; } =20 - ret =3D bdrv_create_file(filename, opts, &local_err); + ret =3D bdrv_create_file(filename, file_opts, &local_err); if (ret < 0) { error_propagate(errp, local_err); goto exit; @@ -847,6 +860,56 @@ exit: return ret; } =20 +static int coroutine_fn vdi_co_create_opts(const char *filename, QemuOpts = *opts, + Error **errp) +{ + QDict *qdict =3D NULL; + BlockdevCreateOptionsVdi *create_options =3D NULL; + uint64_t block_size =3D DEFAULT_CLUSTER_SIZE; + Visitor *v; + Error *local_err =3D NULL; + int ret; + + /* Since CONFIG_VDI_BLOCK_SIZE is disabled by default, + * cluster-size is not part of the QAPI schema; therefore we have + * to parse it before creating the QAPI object. */ +#if defined(CONFIG_VDI_BLOCK_SIZE) + block_size =3D qemu_opt_get_size_del(opts, + BLOCK_OPT_CLUSTER_SIZE, + DEFAULT_CLUSTER_SIZE); + if (block_size < BDRV_SECTOR_SIZE || block_size > UINT32_MAX || + !is_power_of_2(block_size)) + { + error_setg(errp, "Invalid cluster size"); + ret =3D -EINVAL; + goto done; + } +#endif + + qdict =3D qemu_opts_to_qdict_filtered(opts, NULL, &vdi_create_opts, tr= ue); + + qdict_put_str(qdict, "file", ""); /* FIXME */ + + /* Get the QAPI object */ + v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); + visit_type_BlockdevCreateOptionsVdi(v, NULL, &create_options, &local_e= rr); + visit_free(v); + + if (local_err) { + error_propagate(errp, local_err); + ret =3D -EINVAL; + goto done; + } + + create_options->size =3D ROUND_UP(create_options->size, BDRV_SECTOR_SI= ZE); + + ret =3D vdi_co_do_create(filename, opts, create_options, block_size, e= rrp); +done: + QDECREF(qdict); + qapi_free_BlockdevCreateOptionsVdi(create_options); + return ret; +} + static void vdi_close(BlockDriverState *bs) { BDRVVdiState *s =3D bs->opaque; --=20 2.14.3 From nobody Mon May 6 03:45:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520873873451623.1211867763446; Mon, 12 Mar 2018 09:57:53 -0700 (PDT) Received: from localhost ([::1]:33228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evQlk-0008KW-M4 for importer@patchew.org; Mon, 12 Mar 2018 12:57:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evQjg-0006uv-SR for qemu-devel@nongnu.org; Mon, 12 Mar 2018 12:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evQjf-0006hs-RN for qemu-devel@nongnu.org; Mon, 12 Mar 2018 12:55:44 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:58902 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1evQja-0006d2-Vh; Mon, 12 Mar 2018 12:55:39 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6FFF5818B129; Mon, 12 Mar 2018 16:55:38 +0000 (UTC) Received: from localhost (ovpn-204-146.brq.redhat.com [10.40.204.146]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1967110B0F44; Mon, 12 Mar 2018 16:55:37 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 12 Mar 2018 17:55:27 +0100 Message-Id: <20180312165528.8969-3-mreitz@redhat.com> In-Reply-To: <20180312165528.8969-1-mreitz@redhat.com> References: <20180312165528.8969-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 12 Mar 2018 16:55:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 12 Mar 2018 16:55:38 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mreitz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 2/3] vdi: Move file creation to vdi_co_create_opts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefan Weil , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz --- block/vdi.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 0c8f8204ce..2a39b0ac98 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -721,9 +721,7 @@ nonallocating_write: return ret; } =20 -static int coroutine_fn vdi_co_do_create(const char *filename, - QemuOpts *file_opts, - BlockdevCreateOptionsVdi *vdi_opt= s, +static int coroutine_fn vdi_co_do_create(BlockdevCreateOptionsVdi *vdi_opt= s, size_t block_size, Error **errp) { int ret =3D 0; @@ -734,7 +732,7 @@ static int coroutine_fn vdi_co_do_create(const char *fi= lename, size_t i; size_t bmap_size; int64_t offset =3D 0; - Error *local_err =3D NULL; + BlockDriverState *bs_file =3D NULL; BlockBackend *blk =3D NULL; uint32_t *bmap =3D NULL; =20 @@ -770,18 +768,15 @@ static int coroutine_fn vdi_co_do_create(const char *= filename, goto exit; } =20 - ret =3D bdrv_create_file(filename, file_opts, &local_err); - if (ret < 0) { - error_propagate(errp, local_err); + bs_file =3D bdrv_open_blockdev_ref(vdi_opts->file, errp); + if (!bs_file) { + ret =3D -EIO; goto exit; } =20 - blk =3D blk_new_open(filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, - &local_err); - if (blk =3D=3D NULL) { - error_propagate(errp, local_err); - ret =3D -EIO; + blk =3D blk_new(BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL); + ret =3D blk_insert_bs(blk, bs_file, errp); + if (ret < 0) { goto exit; } =20 @@ -818,7 +813,7 @@ static int coroutine_fn vdi_co_do_create(const char *fi= lename, vdi_header_to_le(&header); ret =3D blk_pwrite(blk, offset, &header, sizeof(header), 0); if (ret < 0) { - error_setg(errp, "Error writing header to %s", filename); + error_setg(errp, "Error writing header"); goto exit; } offset +=3D sizeof(header); @@ -839,7 +834,7 @@ static int coroutine_fn vdi_co_do_create(const char *fi= lename, } ret =3D blk_pwrite(blk, offset, bmap, bmap_size, 0); if (ret < 0) { - error_setg(errp, "Error writing bmap to %s", filename); + error_setg(errp, "Error writing bmap"); goto exit; } offset +=3D bmap_size; @@ -849,13 +844,14 @@ static int coroutine_fn vdi_co_do_create(const char *= filename, ret =3D blk_truncate(blk, offset + blocks * block_size, PREALLOC_MODE_OFF, errp); if (ret < 0) { - error_prepend(errp, "Failed to statically allocate %s", filena= me); + error_prepend(errp, "Failed to statically allocate file"); goto exit; } } =20 exit: blk_unref(blk); + bdrv_unref(bs_file); g_free(bmap); return ret; } @@ -865,6 +861,7 @@ static int coroutine_fn vdi_co_create_opts(const char *= filename, QemuOpts *opts, { QDict *qdict =3D NULL; BlockdevCreateOptionsVdi *create_options =3D NULL; + BlockDriverState *bs_file =3D NULL; uint64_t block_size =3D DEFAULT_CLUSTER_SIZE; Visitor *v; Error *local_err =3D NULL; @@ -888,7 +885,19 @@ static int coroutine_fn vdi_co_create_opts(const char = *filename, QemuOpts *opts, =20 qdict =3D qemu_opts_to_qdict_filtered(opts, NULL, &vdi_create_opts, tr= ue); =20 - qdict_put_str(qdict, "file", ""); /* FIXME */ + ret =3D bdrv_create_file(filename, opts, errp); + if (ret < 0) { + goto done; + } + + bs_file =3D bdrv_open(filename, NULL, NULL, + BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, err= p); + if (!bs_file) { + ret =3D -EIO; + goto done; + } + + qdict_put_str(qdict, "file", bs_file->node_name); =20 /* Get the QAPI object */ v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); @@ -903,10 +912,11 @@ static int coroutine_fn vdi_co_create_opts(const char= *filename, QemuOpts *opts, =20 create_options->size =3D ROUND_UP(create_options->size, BDRV_SECTOR_SI= ZE); =20 - ret =3D vdi_co_do_create(filename, opts, create_options, block_size, e= rrp); + ret =3D vdi_co_do_create(create_options, block_size, errp); done: QDECREF(qdict); qapi_free_BlockdevCreateOptionsVdi(create_options); + bdrv_unref(bs_file); return ret; } =20 --=20 2.14.3 From nobody Mon May 6 03:45:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520873864505623.9755249171077; Mon, 12 Mar 2018 09:57:44 -0700 (PDT) Received: from localhost ([::1]:33225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evQlZ-0008AZ-M4 for importer@patchew.org; Mon, 12 Mar 2018 12:57:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evQjg-0006uY-Fg for qemu-devel@nongnu.org; Mon, 12 Mar 2018 12:55:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evQjf-0006h9-Dd for qemu-devel@nongnu.org; Mon, 12 Mar 2018 12:55:44 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:58906 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1evQjc-0006eJ-Sn; Mon, 12 Mar 2018 12:55:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5C7F48182D01; Mon, 12 Mar 2018 16:55:40 +0000 (UTC) Received: from localhost (ovpn-204-146.brq.redhat.com [10.40.204.146]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 07E322026DFD; Mon, 12 Mar 2018 16:55:39 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 12 Mar 2018 17:55:28 +0100 Message-Id: <20180312165528.8969-4-mreitz@redhat.com> In-Reply-To: <20180312165528.8969-1-mreitz@redhat.com> References: <20180312165528.8969-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 12 Mar 2018 16:55:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 12 Mar 2018 16:55:40 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mreitz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 3/3] vdi: Implement .bdrv_co_create X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefan Weil , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz --- qapi/block-core.json | 2 +- block/vdi.c | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index e7110c9a47..5c3186fe4f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -3678,7 +3678,7 @@ 'sheepdog': 'BlockdevCreateOptionsSheepdog', 'ssh': 'BlockdevCreateOptionsSsh', 'throttle': 'BlockdevCreateNotSupported', - 'vdi': 'BlockdevCreateNotSupported', + 'vdi': 'BlockdevCreateOptionsVdi', 'vhdx': 'BlockdevCreateNotSupported', 'vmdk': 'BlockdevCreateNotSupported', 'vpc': 'BlockdevCreateNotSupported', diff --git a/block/vdi.c b/block/vdi.c index 2a39b0ac98..8132e3adfe 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -721,9 +721,10 @@ nonallocating_write: return ret; } =20 -static int coroutine_fn vdi_co_do_create(BlockdevCreateOptionsVdi *vdi_opt= s, +static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_opt= ions, size_t block_size, Error **errp) { + BlockdevCreateOptionsVdi *vdi_opts; int ret =3D 0; uint64_t bytes =3D 0; uint32_t blocks; @@ -736,6 +737,9 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreate= OptionsVdi *vdi_opts, BlockBackend *blk =3D NULL; uint32_t *bmap =3D NULL; =20 + assert(create_options->driver =3D=3D BLOCKDEV_DRIVER_VDI); + vdi_opts =3D &create_options->u.vdi; + logout("\n"); =20 /* Read out options. */ @@ -856,11 +860,17 @@ exit: return ret; } =20 +static int coroutine_fn vdi_co_create(BlockdevCreateOptions *create_option= s, + Error **errp) +{ + return vdi_co_do_create(create_options, DEFAULT_CLUSTER_SIZE, errp); +} + static int coroutine_fn vdi_co_create_opts(const char *filename, QemuOpts = *opts, Error **errp) { QDict *qdict =3D NULL; - BlockdevCreateOptionsVdi *create_options =3D NULL; + BlockdevCreateOptions *create_options =3D NULL; BlockDriverState *bs_file =3D NULL; uint64_t block_size =3D DEFAULT_CLUSTER_SIZE; Visitor *v; @@ -897,11 +907,12 @@ static int coroutine_fn vdi_co_create_opts(const char= *filename, QemuOpts *opts, goto done; } =20 + qdict_put_str(qdict, "driver", "vdi"); qdict_put_str(qdict, "file", bs_file->node_name); =20 /* Get the QAPI object */ v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); - visit_type_BlockdevCreateOptionsVdi(v, NULL, &create_options, &local_e= rr); + visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err); visit_free(v); =20 if (local_err) { @@ -910,12 +921,14 @@ static int coroutine_fn vdi_co_create_opts(const char= *filename, QemuOpts *opts, goto done; } =20 - create_options->size =3D ROUND_UP(create_options->size, BDRV_SECTOR_SI= ZE); + assert(create_options->driver =3D=3D BLOCKDEV_DRIVER_VDI); + create_options->u.vdi.size =3D ROUND_UP(create_options->u.vdi.size, + BDRV_SECTOR_SIZE); =20 ret =3D vdi_co_do_create(create_options, block_size, errp); done: QDECREF(qdict); - qapi_free_BlockdevCreateOptionsVdi(create_options); + qapi_free_BlockdevCreateOptions(create_options); bdrv_unref(bs_file); return ret; } @@ -969,6 +982,7 @@ static BlockDriver bdrv_vdi =3D { .bdrv_reopen_prepare =3D vdi_reopen_prepare, .bdrv_child_perm =3D bdrv_format_default_perms, .bdrv_co_create_opts =3D vdi_co_create_opts, + .bdrv_co_create =3D vdi_co_create, .bdrv_has_zero_init =3D bdrv_has_zero_init_1, .bdrv_co_block_status =3D vdi_co_block_status, .bdrv_make_empty =3D vdi_make_empty, --=20 2.14.3