Commit 4b5805de authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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
parents d2f38a0a ea804cad

block/raw-win32.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

block/rbd.c

+2 −1
Original line number Diff line number Diff line
@@ -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];