From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZcK0-00050G-B6 for qemu-devel@nongnu.org; Thu, 02 Oct 2014 05:05:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZcJu-0002K2-2u for qemu-devel@nongnu.org; Thu, 02 Oct 2014 05:05:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZcJt-0002H2-SA for qemu-devel@nongnu.org; Thu, 02 Oct 2014 05:05:06 -0400 From: Markus Armbruster Date: Thu, 2 Oct 2014 11:04:36 +0200 Message-Id: <1412240698-21695-2-git-send-email-armbru@redhat.com> In-Reply-To: <1412240698-21695-1-git-send-email-armbru@redhat.com> References: <1412240698-21695-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 01/23] block: Split bdrv_new_root() off bdrv_new() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@nodalink.com, stefanha@redhat.com, mreitz@redhat.com Creating an anonymous BDS can't fail. Make that obvious. Signed-off-by: Markus Armbruster Reviewed-by: Max Reitz Reviewed-by: Beno=C3=AEt Canet Reviewed-by: Kevin Wolf --- block.c | 28 +++++++++++++++++++--------- block/iscsi.c | 2 +- block/vvfat.c | 2 +- blockdev.c | 2 +- hw/block/xen_disk.c | 2 +- include/block/block.h | 3 ++- qemu-img.c | 6 +++--- qemu-io.c | 2 +- qemu-nbd.c | 2 +- 9 files changed, 30 insertions(+), 19 deletions(-) diff --git a/block.c b/block.c index d3aebeb..3905c32 100644 --- a/block.c +++ b/block.c @@ -336,10 +336,11 @@ void bdrv_register(BlockDriver *bdrv) } =20 /* create a new block device (by default it is empty) */ -BlockDriverState *bdrv_new(const char *device_name, Error **errp) +BlockDriverState *bdrv_new_root(const char *device_name, Error **errp) { BlockDriverState *bs; - int i; + + assert(*device_name); =20 if (*device_name && !id_wellformed(device_name)) { error_setg(errp, "Invalid device name"); @@ -358,12 +359,21 @@ BlockDriverState *bdrv_new(const char *device_name,= Error **errp) return NULL; } =20 + bs =3D bdrv_new(); + + pstrcpy(bs->device_name, sizeof(bs->device_name), device_name); + QTAILQ_INSERT_TAIL(&bdrv_states, bs, device_list); + + return bs; +} + +BlockDriverState *bdrv_new(void) +{ + BlockDriverState *bs; + int i; + bs =3D g_new0(BlockDriverState, 1); QLIST_INIT(&bs->dirty_bitmaps); - pstrcpy(bs->device_name, sizeof(bs->device_name), device_name); - if (device_name[0] !=3D '\0') { - QTAILQ_INSERT_TAIL(&bdrv_states, bs, device_list); - } for (i =3D 0; i < BLOCK_OP_TYPE_MAX; i++) { QLIST_INIT(&bs->op_blockers[i]); } @@ -1224,7 +1234,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QD= ict *options, Error **errp) goto free_exit; } =20 - backing_hd =3D bdrv_new("", errp); + backing_hd =3D bdrv_new(); =20 if (bs->backing_format[0] !=3D '\0') { back_drv =3D bdrv_find_format(bs->backing_format); @@ -1353,7 +1363,7 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs,= int flags, Error **errp) qdict_put(snapshot_options, "file.filename", qstring_from_str(tmp_filename)); =20 - bs_snapshot =3D bdrv_new("", &error_abort); + bs_snapshot =3D bdrv_new(); =20 ret =3D bdrv_open(&bs_snapshot, NULL, NULL, snapshot_options, flags, bdrv_qcow2, &local_err); @@ -1424,7 +1434,7 @@ int bdrv_open(BlockDriverState **pbs, const char *f= ilename, if (*pbs) { bs =3D *pbs; } else { - bs =3D bdrv_new("", &error_abort); + bs =3D bdrv_new(); } =20 /* NULL means an empty set of options */ diff --git a/block/iscsi.c b/block/iscsi.c index 3a01de0..a7fb764 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1519,7 +1519,7 @@ static int iscsi_create(const char *filename, QemuO= pts *opts, Error **errp) IscsiLun *iscsilun =3D NULL; QDict *bs_options; =20 - bs =3D bdrv_new("", &error_abort); + bs =3D bdrv_new(); =20 /* Read out options */ total_size =3D DIV_ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SI= ZE, 0), diff --git a/block/vvfat.c b/block/vvfat.c index 731e591..6c9fde0 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2939,7 +2939,7 @@ static int enable_write_target(BDRVVVFATState *s, E= rror **errp) unlink(s->qcow_filename); #endif =20 - bdrv_set_backing_hd(s->bs, bdrv_new("", &error_abort)); + bdrv_set_backing_hd(s->bs, bdrv_new()); s->bs->backing_hd->drv =3D &vvfat_write_target; s->bs->backing_hd->opaque =3D g_new(void *, 1); *(void**)s->bs->backing_hd->opaque =3D s; diff --git a/blockdev.c b/blockdev.c index 2f441c5..cf06d6d 100644 --- a/blockdev.c +++ b/blockdev.c @@ -461,7 +461,7 @@ static DriveInfo *blockdev_init(const char *file, QDi= ct *bs_opts, } =20 /* init */ - bs =3D bdrv_new(qemu_opts_id(opts), errp); + bs =3D bdrv_new_root(qemu_opts_id(opts), errp); if (!bs) { goto early_err; } diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 0d27ab1..7f0f66b 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -858,7 +858,7 @@ static int blk_connect(struct XenDevice *xendev) =20 /* setup via xenbus -> create new block driver instance */ xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup= )\n"); - blkdev->bs =3D bdrv_new(blkdev->dev, NULL); + blkdev->bs =3D bdrv_new_root(blkdev->dev, NULL); if (!blkdev->bs) { return -1; } diff --git a/include/block/block.h b/include/block/block.h index 3318f0d..a3039ce 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -204,7 +204,8 @@ BlockDriver *bdrv_find_whitelisted_format(const char = *format_name, int bdrv_create(BlockDriver *drv, const char* filename, QemuOpts *opts, Error **errp); int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp)= ; -BlockDriverState *bdrv_new(const char *device_name, Error **errp); +BlockDriverState *bdrv_new_root(const char *device_name, Error **errp); +BlockDriverState *bdrv_new(void); void bdrv_make_anon(BlockDriverState *bs); void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old); void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top); diff --git a/qemu-img.c b/qemu-img.c index 27b85db..9c77dcc 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -296,7 +296,7 @@ static BlockDriverState *bdrv_new_open(const char *id= , Error *local_err =3D NULL; int ret; =20 - bs =3D bdrv_new(id, &error_abort); + bs =3D bdrv_new_root(id, &error_abort); =20 if (fmt) { drv =3D bdrv_find_format(fmt); @@ -2423,7 +2423,7 @@ static int img_rebase(int argc, char **argv) if (!unsafe) { char backing_name[1024]; =20 - bs_old_backing =3D bdrv_new("old_backing", &error_abort); + bs_old_backing =3D bdrv_new_root("old_backing", &error_abort); bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name)= ); ret =3D bdrv_open(&bs_old_backing, backing_name, NULL, NULL, src= _flags, old_backing_drv, &local_err); @@ -2434,7 +2434,7 @@ static int img_rebase(int argc, char **argv) goto out; } if (out_baseimg[0]) { - bs_new_backing =3D bdrv_new("new_backing", &error_abort); + bs_new_backing =3D bdrv_new_root("new_backing", &error_abort= ); ret =3D bdrv_open(&bs_new_backing, out_baseimg, NULL, NULL, = src_flags, new_backing_drv, &local_err); if (ret) { diff --git a/qemu-io.c b/qemu-io.c index 66cf3ef..d131dc5 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -58,7 +58,7 @@ static int openfile(char *name, int flags, int growable= , QDict *opts) return 1; } =20 - qemuio_bs =3D bdrv_new("hda", &error_abort); + qemuio_bs =3D bdrv_new_root("hda", &error_abort); =20 if (growable) { flags |=3D BDRV_O_PROTOCOL; diff --git a/qemu-nbd.c b/qemu-nbd.c index b524b34..d9f1749 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -691,7 +691,7 @@ int main(int argc, char **argv) drv =3D NULL; } =20 - bs =3D bdrv_new("hda", &error_abort); + bs =3D bdrv_new_root("hda", &error_abort); =20 srcpath =3D argv[optind]; ret =3D bdrv_open(&bs, srcpath, NULL, NULL, flags, drv, &local_err); --=20 1.9.3