From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNh4E-00087f-UY for qemu-devel@nongnu.org; Wed, 12 Mar 2014 07:11:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNh49-0001A6-UK for qemu-devel@nongnu.org; Wed, 12 Mar 2014 07:11:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9283) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNh49-00019z-NE for qemu-devel@nongnu.org; Wed, 12 Mar 2014 07:11:17 -0400 From: Stefan Hajnoczi Date: Wed, 12 Mar 2014 11:29:28 +0100 Message-Id: <1394620172-25071-21-git-send-email-stefanha@redhat.com> In-Reply-To: <1394620172-25071-1-git-send-email-stefanha@redhat.com> References: <1394620172-25071-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 20/24] block/raw-posix: bdrv_parse_filename() for hdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori From: Max Reitz The "host_device" protocol driver should strip the "host_device:" prefix from filenames if present. Signed-off-by: Max Reitz Reviewed-by: Benoit Canet Signed-off-by: Stefan Hajnoczi --- block/raw-posix.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/raw-posix.c b/block/raw-posix.c index e6b4c1f..ab32ff9 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1561,6 +1561,15 @@ static int check_hdev_writable(BDRVRawState *s) return 0; } +static void hdev_parse_filename(const char *filename, QDict *options, + Error **errp) +{ + /* The prefix is optional, just as for "file". */ + strstart(filename, "host_device:", &filename); + + qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename))); +} + static int hdev_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { @@ -1805,6 +1814,7 @@ static BlockDriver bdrv_host_device = { .instance_size = sizeof(BDRVRawState), .bdrv_needs_filename = true, .bdrv_probe_device = hdev_probe_device, + .bdrv_parse_filename = hdev_parse_filename, .bdrv_file_open = hdev_open, .bdrv_close = raw_close, .bdrv_reopen_prepare = raw_reopen_prepare, -- 1.8.5.3