Message ID | 1364110875-7074-1-git-send-email-namei.unix@gmail.com |
---|---|
State | New |
Headers | show |
Am 24.03.2013 08:41, schrieb Liu Yuan: > From: Liu Yuan <tailai.ly@taobao.com> > > Commit 787e4a85 [block: Add options QDict to bdrv_file_open() prototypes] didn't > update rbd.c accordingly. > > Cc: Kevin Wolf <kwolf@redhat.com> > Cc: Stefan Hajnoczi <stefanha@redhat.com> > Signed-off-by: Liu Yuan <tailai.ly@taobao.com> > --- > block/rbd.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/block/rbd.c b/block/rbd.c > index 8cd10a7..1a8ea6d 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]; Reviewed-by: Stefan Weil <sw@weilnetz.de>
On Sun, Mar 24, 2013 at 03:41:15PM +0800, Liu Yuan wrote: > From: Liu Yuan <tailai.ly@taobao.com> > > Commit 787e4a85 [block: Add options QDict to bdrv_file_open() prototypes] didn't > update rbd.c accordingly. > > Cc: Kevin Wolf <kwolf@redhat.com> > Cc: Stefan Hajnoczi <stefanha@redhat.com> > Signed-off-by: Liu Yuan <tailai.ly@taobao.com> > --- > block/rbd.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
diff --git a/block/rbd.c b/block/rbd.c index 8cd10a7..1a8ea6d 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];