Patchwork rbd: fix compile error

login
register
mail settings
Submitter namei.unix@gmail.com
Date March 24, 2013, 7:41 a.m.
Message ID <1364110875-7074-1-git-send-email-namei.unix@gmail.com>
Download mbox | patch
Permalink /patch/230378/
State New
Headers show

Comments

namei.unix@gmail.com - March 24, 2013, 7:41 a.m.
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(-)
Stefan Weil - March 24, 2013, 8:06 a.m.
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>
Stefan Hajnoczi - March 25, 2013, 8:53 a.m.
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

Patch

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