diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-25 13:14:20 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-25 13:14:20 -0500 |
| commit | 4b5805de49edec5a81fe810bb612317de6545a38 (patch) | |
| tree | d6ad52a98d23d3768ff8025938b08a8fc7d10673 | |
| parent | d2f38a0acb0a1c5b7ab7621a32d603d08d513bea (diff) | |
| parent | ea804cadf867a0521b9069193db339d041a40689 (diff) | |
Merge remote-tracking branch 'stefanha/block' into staging
# By Liu Yuan (1) and Stefan Weil (1)
# Via Stefan Hajnoczi
* stefanha/block:
block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build)
rbd: fix compile error
| -rw-r--r-- | block/raw-win32.c | 6 | ||||
| -rw-r--r-- | block/rbd.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/block/raw-win32.c b/block/raw-win32.c index 18e0068b26..ece2f1a809 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; diff --git a/block/rbd.c b/block/rbd.c index 8cd10a7b59..1a8ea6d492 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -441,7 +441,8 @@ static int qemu_rbd_aio_flush_cb(void *opaque) return (s->qemu_aio_count > 0); } -static int qemu_rbd_open(BlockDriverState *bs, const char *filename, int flags) +static int qemu_rbd_open(BlockDriverState *bs, const char *filename, + QDict *options, int flags) { BDRVRBDState *s = bs->opaque; char pool[RBD_MAX_POOL_NAME_SIZE]; |