qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PULL 24/24] block/raw-win32: bdrv_parse_filename() for hdev
Date: Wed, 12 Mar 2014 11:29:32 +0100	[thread overview]
Message-ID: <1394620172-25071-25-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1394620172-25071-1-git-send-email-stefanha@redhat.com>

From: Max Reitz <mreitz@redhat.com>

The "host_device" protocol driver should strip the "host_device:" 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>
---
 block/raw-win32.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/block/raw-win32.c b/block/raw-win32.c
index 9954748..48cb2c2 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -593,6 +593,15 @@ static int hdev_probe_device(const char *filename)
     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)
 {
@@ -663,6 +672,7 @@ static BlockDriver bdrv_host_device = {
     .protocol_name	= "host_device",
     .instance_size	= sizeof(BDRVRawState),
     .bdrv_needs_filename = true,
+    .bdrv_parse_filename = hdev_parse_filename,
     .bdrv_probe_device	= hdev_probe_device,
     .bdrv_file_open	= hdev_open,
     .bdrv_close		= raw_close,
-- 
1.8.5.3

  parent reply	other threads:[~2014-03-12 11:04 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-12 10:29 [Qemu-devel] [PULL 00/24] Block patches for QEMU 2.0 Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 01/24] qcow2-refcount: Sanitize refcount table entry Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 02/24] block: Update image size in bdrv_invalidate_cache() Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 03/24] qcow2: Check bs->drv in copy_sectors() Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 04/24] block: bs->drv may be NULL in bdrv_debug_resume() Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 05/24] iotests: Test corruption during COW request Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 06/24] block: Rewrite the snapshot authorization mechanism for block filters Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 07/24] object: add object_get_canonical_path_component() Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 08/24] rfifolock: add recursive FIFO lock Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 09/24] aio: add aio_context_acquire() and aio_context_release() Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 10/24] iothread: add I/O thread object Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 11/24] qdev: make get_pointer() handle temporary strings Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 12/24] iothread: add "iothread" qdev property type Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 13/24] dataplane: replace internal thread with IOThread Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 14/24] iothread: stash thread ID away Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 15/24] qmp: add query-iothreads command Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 16/24] qcow2: Keep option in qcow2_invalidate_cache() Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 17/24] qcow2: Don't write with BDRV_O_INCOMING Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 18/24] block: Unlink temporary file Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 19/24] qemu-io: Fix warnings from static code analysis Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 20/24] block/raw-posix: bdrv_parse_filename() for hdev Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 21/24] block/raw-posix: bdrv_parse_filename() for floppy Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 22/24] block/raw-posix: bdrv_parse_filename() for cdrom Stefan Hajnoczi
2014-03-12 10:29 ` [Qemu-devel] [PULL 23/24] block/raw-posix: Strip protocol prefix on creation Stefan Hajnoczi
2014-03-12 10:29 ` Stefan Hajnoczi [this message]
2014-03-12 15:48 ` [Qemu-devel] [PULL 00/24] Block patches for QEMU 2.0 Peter Maydell
2014-03-13 12:33   ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1394620172-25071-25-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).