From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLgk0-0007Nj-7d for qemu-devel@nongnu.org; Thu, 06 Mar 2014 17:26:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLgju-0008N7-79 for qemu-devel@nongnu.org; Thu, 06 Mar 2014 17:26:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLgjt-0008My-S8 for qemu-devel@nongnu.org; Thu, 06 Mar 2014 17:26:06 -0500 From: Max Reitz Date: Thu, 6 Mar 2014 23:25:37 +0100 Message-Id: <1394144739-2294-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1394144739-2294-1-git-send-email-mreitz@redhat.com> References: <1394144739-2294-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] block/raw-posix: bdrv_parse_filename() for cdrom List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz The "host_cdrom" protocol drivers should strip the "host_cdrom:" prefix from filenames if present. Signed-off-by: Max Reitz --- block/raw-posix.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/block/raw-posix.c b/block/raw-posix.c index 4b8c183..6c9b8f2 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1984,6 +1984,15 @@ static BlockDriver bdrv_host_floppy = { .bdrv_eject = floppy_eject, }; +static void cdrom_parse_filename(const char *filename, QDict *options, + Error **errp) +{ + /* The prefix is optional, just as for "file". */ + strstart(filename, "host_cdrom:", &filename); + + qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename))); +} + static int cdrom_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { @@ -2070,6 +2079,7 @@ static BlockDriver bdrv_host_cdrom = { .instance_size = sizeof(BDRVRawState), .bdrv_needs_filename = true, .bdrv_probe_device = cdrom_probe_device, + .bdrv_parse_filename = cdrom_parse_filename, .bdrv_file_open = cdrom_open, .bdrv_close = raw_close, .bdrv_reopen_prepare = raw_reopen_prepare, @@ -2101,6 +2111,15 @@ static BlockDriver bdrv_host_cdrom = { #endif /* __linux__ */ #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__) +static void cdrom_parse_filename(const char *filename, QDict *options, + Error **errp) +{ + /* The prefix is optional, just as for "file". */ + strstart(filename, "host_cdrom:", &filename); + + qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename))); +} + static int cdrom_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { @@ -2200,6 +2219,7 @@ static BlockDriver bdrv_host_cdrom = { .instance_size = sizeof(BDRVRawState), .bdrv_needs_filename = true, .bdrv_probe_device = cdrom_probe_device, + .bdrv_parse_filename = cdrom_parse_filename, .bdrv_file_open = cdrom_open, .bdrv_close = raw_close, .bdrv_reopen_prepare = raw_reopen_prepare, -- 1.9.0