From: Max Reitz <mreitz@redhat.com>
Date: Fri, 7 Mar 2014 23:39:42 +0000 (+0100)
Subject: block/raw-posix: bdrv_parse_filename() for floppy
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~386^2~42^2~93^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3f49845831d75fa2e2a5dab04cb78fb12f8a2bc;p=sdk%2Femulator%2Fqemu.git

block/raw-posix: bdrv_parse_filename() for floppy

The "host_floppy" protocol driver should strip the "host_floppy:" prefix
from filenames if present.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/block/raw-posix.c b/block/raw-posix.c
index ab32ff99da..4b8c1839ce 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -1844,6 +1844,15 @@ static BlockDriver bdrv_host_device = {
 };
 
 #ifdef __linux__
+static void floppy_parse_filename(const char *filename, QDict *options,
+                                  Error **errp)
+{
+    /* The prefix is optional, just as for "file". */
+    strstart(filename, "host_floppy:", &filename);
+
+    qdict_put_obj(options, "filename", QOBJECT(qstring_from_str(filename)));
+}
+
 static int floppy_open(BlockDriverState *bs, QDict *options, int flags,
                        Error **errp)
 {
@@ -1949,6 +1958,7 @@ static BlockDriver bdrv_host_floppy = {
     .instance_size      = sizeof(BDRVRawState),
     .bdrv_needs_filename = true,
     .bdrv_probe_device	= floppy_probe_device,
+    .bdrv_parse_filename = floppy_parse_filename,
     .bdrv_file_open     = floppy_open,
     .bdrv_close         = raw_close,
     .bdrv_reopen_prepare = raw_reopen_prepare,