From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cTEDj-0000qU-KB for qemu-devel@nongnu.org; Mon, 16 Jan 2017 15:49:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cTEDi-0003mz-Mt for qemu-devel@nongnu.org; Mon, 16 Jan 2017 15:49:39 -0500 From: Max Reitz Date: Mon, 16 Jan 2017 21:49:08 +0100 Message-Id: <20170116204921.31578-5-mreitz@redhat.com> In-Reply-To: <20170111181432.18868-1-mreitz@redhat.com> References: <20170111181432.18868-1-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v4 12/25] quorum: Make bdrv_dirname() return NULL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Alberto Garcia , Kevin Wolf , Eric Blake While the common implementation for bdrv_dirname() should return NULL for quorum BDSs already (because they do not have a file node and their exact_filename field should be empty), there is no reason not to make that explicit. Signed-off-by: Max Reitz --- block/quorum.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/block/quorum.c b/block/quorum.c index 112370eea2..3b5da08ec3 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1105,6 +1105,16 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options) bs->full_open_options = opts; } +static char *quorum_dirname(BlockDriverState *bs, Error **errp) +{ + /* In general, there are multiple BDSs with different dirnames below this + * one; so there is no unique dirname we could return (unless all are equal + * by chance, or there is only one). Therefore, to be consistent, just + * always return NULL. */ + error_setg(errp, "Cannot generate a base directory for quorum nodes"); + return NULL; +} + static BlockDriver bdrv_quorum = { .format_name = "quorum", .protocol_name = "quorum", @@ -1114,6 +1124,7 @@ static BlockDriver bdrv_quorum = { .bdrv_file_open = quorum_open, .bdrv_close = quorum_close, .bdrv_refresh_filename = quorum_refresh_filename, + .bdrv_dirname = quorum_dirname, .bdrv_co_flush_to_disk = quorum_co_flush, -- 2.11.0