From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYcdI-0005F5-7j for qemu-devel@nongnu.org; Thu, 19 Mar 2015 11:45:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYcdC-0000mH-IQ for qemu-devel@nongnu.org; Thu, 19 Mar 2015 11:45:16 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:32500 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYcdC-0000Af-Bt for qemu-devel@nongnu.org; Thu, 19 Mar 2015 11:45:10 -0400 From: Alberto Garcia Date: Thu, 19 Mar 2015 17:43:40 +0200 Message-Id: <1300de97ea0a05962e60de5aba0eb56b5b77c6ee.1426779661.git.berto@igalia.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 1/3] block: add bdrv_get_device_or_node_name() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Alberto Garcia , Stefan Hajnoczi This function gets the device name associated with a BlockDriverState, or its node name if the device name is empty. Signed-off-by: Alberto Garcia --- block.c | 5 +++++ block/quorum.c | 5 +---- include/block/block.h | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 0fe97de..af284e3 100644 --- a/block.c +++ b/block.c @@ -3920,6 +3920,11 @@ const char *bdrv_get_device_name(const BlockDriverState *bs) return bs->blk ? blk_name(bs->blk) : ""; } +const char *bdrv_get_device_or_node_name(const BlockDriverState *bs) +{ + return bs->blk ? blk_name(bs->blk) : bs->node_name; +} + int bdrv_get_flags(BlockDriverState *bs) { return bs->open_flags; diff --git a/block/quorum.c b/block/quorum.c index 437b122..f91ef75 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -226,10 +226,7 @@ static void quorum_report_bad(QuorumAIOCB *acb, char *node_name, int ret) static void quorum_report_failure(QuorumAIOCB *acb) { - const char *reference = bdrv_get_device_name(acb->common.bs)[0] ? - bdrv_get_device_name(acb->common.bs) : - acb->common.bs->node_name; - + const char *reference = bdrv_get_device_or_node_name(acb->common.bs); qapi_event_send_quorum_failure(reference, acb->sector_num, acb->nb_sectors, &error_abort); } diff --git a/include/block/block.h b/include/block/block.h index 4c57d63..b285e0d 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -398,6 +398,7 @@ void bdrv_iterate_format(void (*it)(void *opaque, const char *name), void *opaque); const char *bdrv_get_node_name(const BlockDriverState *bs); const char *bdrv_get_device_name(const BlockDriverState *bs); +const char *bdrv_get_device_or_node_name(const BlockDriverState *bs); int bdrv_get_flags(BlockDriverState *bs); int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num, const uint8_t *buf, int nb_sectors); -- 2.1.4