Patchwork block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build)

login
register
mail settings
Submitter Stefan Weil
Date March 24, 2013, 7:08 a.m.
Message ID <1364108916-15088-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/230372/
State Accepted
Headers show

Comments

Stefan Weil - March 24, 2013, 7:08 a.m.
The new parameter is unused yet.

This part was missing in commit 787e4a8500020695eb391e2f1cc4767ee071d441.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 block/raw-win32.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Stefan Hajnoczi - March 25, 2013, 8:53 a.m.
On Sun, Mar 24, 2013 at 08:08:36AM +0100, Stefan Weil wrote:
> The new parameter is unused yet.
> 
> This part was missing in commit 787e4a8500020695eb391e2f1cc4767ee071d441.
> 
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Eric Blake <eblake@redhat.com>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  block/raw-win32.c |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

Patch

diff --git a/block/raw-win32.c b/block/raw-win32.c
index 18e0068..ece2f1a 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -221,7 +221,8 @@  static void raw_parse_flags(int flags, int *access_flags, DWORD *overlapped)
     }
 }
 
-static int raw_open(BlockDriverState *bs, const char *filename, int flags)
+static int raw_open(BlockDriverState *bs, const char *filename,
+                    QDict *options, int flags)
 {
     BDRVRawState *s = bs->opaque;
     int access_flags;
@@ -494,7 +495,8 @@  static int hdev_probe_device(const char *filename)
     return 0;
 }
 
-static int hdev_open(BlockDriverState *bs, const char *filename, int flags)
+static int hdev_open(BlockDriverState *bs, const char *filename,
+                     QDict *options, int flags)
 {
     BDRVRawState *s = bs->opaque;
     int access_flags, create_flags;