From patchwork Tue Sep 16 18:12:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 390135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 51B6614016A for ; Wed, 17 Sep 2014 04:13:57 +1000 (EST) Received: from localhost ([::1]:39930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTxFp-0004ZG-Ug for incoming@patchwork.ozlabs.org; Tue, 16 Sep 2014 14:13:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTxF8-0003V7-1i for qemu-devel@nongnu.org; Tue, 16 Sep 2014 14:12:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XTxF2-0003Ea-1Y for qemu-devel@nongnu.org; Tue, 16 Sep 2014 14:12:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XTxF1-0003DO-QK for qemu-devel@nongnu.org; Tue, 16 Sep 2014 14:12:39 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8GICXCx032720 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 16 Sep 2014 14:12:33 -0400 Received: from blackfin.pond.sub.org (ovpn-116-29.ams2.redhat.com [10.36.116.29]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8GICT89021061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 16 Sep 2014 14:12:31 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D18383008AD9; Tue, 16 Sep 2014 20:12:28 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 16 Sep 2014 20:12:06 +0200 Message-Id: <1410891148-28849-2-git-send-email-armbru@redhat.com> In-Reply-To: <1410891148-28849-1-git-send-email-armbru@redhat.com> References: <1410891148-28849-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id s8GICXCx032720 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, famz@redhat.com, benoit.canet@nodalink.com, stefanha@redhat.com, mreitz@redhat.com Subject: [Qemu-devel] [PATCH v3 01/23] block: Split bdrv_new_root() off bdrv_new() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Creating an anonymous BDS can't fail. Make that obvious. Signed-off-by: Markus Armbruster Reviewed-by: Max Reitz Reviewed-by: Benoît 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 2ac6a3b..934881f 100644 --- a/block.c +++ b/block.c @@ -336,10 +336,11 @@ void bdrv_register(BlockDriver *bdrv) } /* 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); if (bdrv_find(device_name)) { error_setg(errp, "Device with id '%s' already exists", @@ -353,12 +354,21 @@ BlockDriverState *bdrv_new(const char *device_name, Error **errp) return NULL; } + bs = 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 = g_new0(BlockDriverState, 1); QLIST_INIT(&bs->dirty_bitmaps); - pstrcpy(bs->device_name, sizeof(bs->device_name), device_name); - if (device_name[0] != '\0') { - QTAILQ_INSERT_TAIL(&bdrv_states, bs, device_list); - } for (i = 0; i < BLOCK_OP_TYPE_MAX; i++) { QLIST_INIT(&bs->op_blockers[i]); } @@ -1219,7 +1229,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) goto free_exit; } - backing_hd = bdrv_new("", errp); + backing_hd = bdrv_new(); if (bs->backing_format[0] != '\0') { back_drv = bdrv_find_format(bs->backing_format); @@ -1348,7 +1358,7 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) qdict_put(snapshot_options, "file.filename", qstring_from_str(tmp_filename)); - bs_snapshot = bdrv_new("", &error_abort); + bs_snapshot = bdrv_new(); ret = bdrv_open(&bs_snapshot, NULL, NULL, snapshot_options, flags, bdrv_qcow2, &local_err); @@ -1419,7 +1429,7 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, if (*pbs) { bs = *pbs; } else { - bs = bdrv_new("", &error_abort); + bs = bdrv_new(); } /* NULL means an empty set of options */ diff --git a/block/iscsi.c b/block/iscsi.c index 84bcae8..166d1b9 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1528,7 +1528,7 @@ static int iscsi_create(const char *filename, QemuOpts *opts, Error **errp) IscsiLun *iscsilun = NULL; QDict *bs_options; - bs = bdrv_new("", &error_abort); + bs = bdrv_new(); /* Read out options */ total_size = DIV_ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 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, Error **errp) unlink(s->qcow_filename); #endif - bdrv_set_backing_hd(s->bs, bdrv_new("", &error_abort)); + bdrv_set_backing_hd(s->bs, bdrv_new()); s->bs->backing_hd->drv = &vvfat_write_target; s->bs->backing_hd->opaque = g_new(void *, 1); *(void**)s->bs->backing_hd->opaque = s; diff --git a/blockdev.c b/blockdev.c index 450f95c..c9463e3 100644 --- a/blockdev.c +++ b/blockdev.c @@ -463,7 +463,7 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts, } /* init */ - bs = bdrv_new(qemu_opts_id(opts), errp); + bs = 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) /* setup via xenbus -> create new block driver instance */ xen_be_printf(&blkdev->xendev, 2, "create new bdrv (xenbus setup)\n"); - blkdev->bs = bdrv_new(blkdev->dev, NULL); + blkdev->bs = bdrv_new_root(blkdev->dev, NULL); if (!blkdev->bs) { return -1; } diff --git a/include/block/block.h b/include/block/block.h index 07d6d8e..8cf953a 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 91d1ac3..58d59d0 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -296,7 +296,7 @@ static BlockDriverState *bdrv_new_open(const char *id, Error *local_err = NULL; int ret; - bs = bdrv_new(id, &error_abort); + bs = bdrv_new_root(id, &error_abort); if (fmt) { drv = bdrv_find_format(fmt); @@ -2425,7 +2425,7 @@ static int img_rebase(int argc, char **argv) if (!unsafe) { char backing_name[1024]; - bs_old_backing = bdrv_new("old_backing", &error_abort); + bs_old_backing = bdrv_new_root("old_backing", &error_abort); bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name)); ret = bdrv_open(&bs_old_backing, backing_name, NULL, NULL, src_flags, old_backing_drv, &local_err); @@ -2436,7 +2436,7 @@ static int img_rebase(int argc, char **argv) goto out; } if (out_baseimg[0]) { - bs_new_backing = bdrv_new("new_backing", &error_abort); + bs_new_backing = bdrv_new_root("new_backing", &error_abort); ret = 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 d2ab694..24ca59c 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; } - qemuio_bs = bdrv_new("hda", &error_abort); + qemuio_bs = bdrv_new_root("hda", &error_abort); if (growable) { flags |= BDRV_O_PROTOCOL; diff --git a/qemu-nbd.c b/qemu-nbd.c index f3cf8a2..24b8454 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -687,7 +687,7 @@ int main(int argc, char **argv) drv = NULL; } - bs = bdrv_new("hda", &error_abort); + bs = bdrv_new_root("hda", &error_abort); srcpath = argv[optind]; ret = bdrv_open(&bs, srcpath, NULL, NULL, flags, drv, &local_err);