summaryrefslogtreecommitdiffstats
path: root/block/quorum.c
diff options
context:
space:
mode:
authorAlberto Garcia <berto@igalia.com>2015-04-08 12:29:18 +0300
committerKevin Wolf <kwolf@redhat.com>2015-04-28 15:36:09 +0200
commit9b2aa84f87f5b95cb0295dcae38fbfbf115df2be (patch)
treefb2762247eacc84b4d217a126aeb6239d7614207 /block/quorum.c
parentec683d604069dcdaaa516789274bc0cdc14e5247 (diff)
downloadhqemu-9b2aa84f87f5b95cb0295dcae38fbfbf115df2be.zip
hqemu-9b2aa84f87f5b95cb0295dcae38fbfbf115df2be.tar.gz
block: add bdrv_get_device_or_node_name()
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 <berto@igalia.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 4fa30aa8d61d9052ce266fd5429a59a14e941255.1428485266.git.berto@igalia.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/quorum.c')
-rw-r--r--block/quorum.c5
1 files changed, 1 insertions, 4 deletions
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);
}
OpenPOWER on IntegriCloud