From patchwork Tue Oct 7 11:59:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 397249 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 C728F1400B0 for ; Tue, 7 Oct 2014 23:04:01 +1100 (EST) Received: from localhost ([::1]:57981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbTUl-00044x-Ji for incoming@patchwork.ozlabs.org; Tue, 07 Oct 2014 08:03:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbTQg-0006FV-Ob for qemu-devel@nongnu.org; Tue, 07 Oct 2014 07:59:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XbTQX-0002Y6-9F for qemu-devel@nongnu.org; Tue, 07 Oct 2014 07:59:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbTQX-0002Y2-1K for qemu-devel@nongnu.org; Tue, 07 Oct 2014 07:59:37 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s97BxYmm018258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 7 Oct 2014 07:59:34 -0400 Received: from blackfin.pond.sub.org (ovpn-116-51.ams2.redhat.com [10.36.116.51]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s97BxVNP001159 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 7 Oct 2014 07:59:32 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 009E13046048; Tue, 7 Oct 2014 13:59:26 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 7 Oct 2014 13:59:12 +0200 Message-Id: <1412683166-4934-11-git-send-email-armbru@redhat.com> In-Reply-To: <1412683166-4934-1-git-send-email-armbru@redhat.com> References: <1412683166-4934-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, benoit.canet@nodalink.com, stefanha@redhat.com, mreitz@redhat.com Subject: [Qemu-devel] [PATCH v6 10/24] block: Merge BlockBackend and BlockDriverState name spaces 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 BlockBackend's name space is separate only to keep the initial patches simple. Time to merge the two. Retain bdrv_find() and bdrv_get_device_name() for now, to keep this series manageable. Signed-off-by: Markus Armbruster Reviewed-by: Max Reitz --- block.c | 48 ++++++++++++------------------------------------ block/block-backend.c | 17 +++++++++++------ include/block/block.h | 2 +- 3 files changed, 24 insertions(+), 43 deletions(-) diff --git a/block.c b/block.c index fd57cc0..b075669 100644 --- a/block.c +++ b/block.c @@ -335,31 +335,9 @@ void bdrv_register(BlockDriver *bdrv) QLIST_INSERT_HEAD(&bdrv_drivers, bdrv, list); } -/* create a new block device (by default it is empty) */ -BlockDriverState *bdrv_new_root(const char *device_name, Error **errp) +BlockDriverState *bdrv_new_root(void) { - BlockDriverState *bs; - - assert(*device_name); - - if (*device_name && !id_wellformed(device_name)) { - error_setg(errp, "Invalid device name"); - return NULL; - } - - if (bdrv_find(device_name)) { - error_setg(errp, "Device with id '%s' already exists", - device_name); - return NULL; - } - if (bdrv_find_node(device_name)) { - error_setg(errp, - "Device name '%s' conflicts with an existing node name", - device_name); - return NULL; - } - - bs = bdrv_new(); + BlockDriverState *bs = bdrv_new(); QTAILQ_INSERT_TAIL(&bdrv_states, bs, device_list); return bs; @@ -883,7 +861,7 @@ static void bdrv_assign_node_name(BlockDriverState *bs, } /* takes care of avoiding namespaces collisions */ - if (bdrv_find(node_name)) { + if (blk_by_name(node_name)) { error_setg(errp, "node-name=%s is conflicting with a device id", node_name); return; @@ -3817,16 +3795,12 @@ void bdrv_iterate_format(void (*it)(void *opaque, const char *name), } /* This function is to find block backend bs */ +/* TODO convert callers to blk_by_name(), then remove */ BlockDriverState *bdrv_find(const char *name) { - BlockDriverState *bs; + BlockBackend *blk = blk_by_name(name); - QTAILQ_FOREACH(bs, &bdrv_states, device_list) { - if (!strcmp(name, bdrv_get_device_name(bs))) { - return bs; - } - } - return NULL; + return blk ? blk_bs(blk) : NULL; } /* This function is to find a node in the bs graph */ @@ -3865,13 +3839,14 @@ BlockDriverState *bdrv_lookup_bs(const char *device, const char *node_name, Error **errp) { - BlockDriverState *bs = NULL; + BlockBackend *blk; + BlockDriverState *bs; if (device) { - bs = bdrv_find(device); + blk = blk_by_name(device); - if (bs) { - return bs; + if (blk) { + return blk_bs(blk); } } @@ -3908,6 +3883,7 @@ BlockDriverState *bdrv_next(BlockDriverState *bs) return QTAILQ_NEXT(bs, device_list); } +/* TODO check what callers really want: bs->node_name or blk_name() */ const char *bdrv_get_device_name(const BlockDriverState *bs) { return bs->blk ? blk_name(bs->blk) : ""; diff --git a/block/block-backend.c b/block/block-backend.c index 6236b5b..fb91680 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -40,10 +40,20 @@ BlockBackend *blk_new(const char *name, Error **errp) BlockBackend *blk; assert(name && name[0]); + if (!id_wellformed(name)) { + error_setg(errp, "Invalid device name"); + return NULL; + } if (blk_by_name(name)) { error_setg(errp, "Device with id '%s' already exists", name); return NULL; } + if (bdrv_find_node(name)) { + error_setg(errp, + "Device name '%s' conflicts with an existing node name", + name); + return NULL; + } blk = g_new0(BlockBackend, 1); blk->name = g_strdup(name); @@ -66,12 +76,7 @@ BlockBackend *blk_new_with_bs(const char *name, Error **errp) return NULL; } - bs = bdrv_new_root(name, errp); - if (!bs) { - blk_unref(blk); - return NULL; - } - + bs = bdrv_new_root(); blk->bs = bs; bs->blk = blk; return blk; diff --git a/include/block/block.h b/include/block/block.h index 3880e05..3dc7c56 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -204,7 +204,7 @@ 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_root(const char *device_name, Error **errp); +BlockDriverState *bdrv_new_root(void); BlockDriverState *bdrv_new(void); void bdrv_make_anon(BlockDriverState *bs); void bdrv_swap(BlockDriverState *bs_new, BlockDriverState *bs_old);