mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/block' into staging

Browse Source 
# 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
This commit is contained in:
Anthony Liguori 2013-03-25 13:14:20 -05:00
commit 4b5805de49
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/raw-win32.c
View File

@ -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;

3
block/rbd.c
View File

@ -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];