[Qemu-devel] [PULL 0/2] Block patches

[Qemu-devel] [PULL 0/2] Block patches

[Stefan Hajnoczi]

This tiny pull request contains build fixes for a regression introduced in the
last pull request.

Kevin and I investigated to find out why these build failures were missed.
Both my buildslave and Kevin's workstation did not have the rbd libraries
installed so block/rbd.c was not built.

The buildslave now has the missing libraries and will warn us if block/rbd.c
breaks again.  Kevin has also installed the package so his local builds
exercise the code.

The mingw build is already failing in buildbot due to an unrelated issue.  The
bdrv_file_open() prototype warning was not spotted amongst all the other
warnings.

The following changes since commit fe6344a05fba26e16863fefcb823242e579b0991:

  Remove device_tree.o from hw/moxie/Makefile.objs. (2013-03-24 11:30:04 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git block

for you to fetch changes up to ea804cadf867a0521b9069193db339d041a40689:

  block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build) (2013-03-25 09:53:04 +0100)

----------------------------------------------------------------
Liu Yuan (1):
      rbd: fix compile error

Stefan Weil (1):
      block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build)

 block/raw-win32.c | 6 ++++--
 block/rbd.c       | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
1.8.1.4

[Qemu-devel] [PATCH 1/2] rbd: fix compile error

[Stefan Hajnoczi]

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>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.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];
-- 
1.8.1.4

[Qemu-devel] [PATCH 2/2] block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build)

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

The new parameter is unused yet.

This part was missing in commit 787e4a8500020695eb391e2f1cc4767ee071d441.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/raw-win32.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/block/raw-win32.c b/block/raw-win32.c
index 18e0068..ece2f1a 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;
-- 
1.8.1.4

Re: [Qemu-devel] [PULL 0/2] Block patches

[Richard W.M. Jones]

On Mon, Mar 25, 2013 at 12:00:47PM +0100, Stefan Hajnoczi wrote:
> This tiny pull request contains build fixes for a regression introduced in the
> last pull request.
> 
> Kevin and I investigated to find out why these build failures were missed.
> Both my buildslave and Kevin's workstation did not have the rbd libraries
> installed so block/rbd.c was not built.
> 
> The buildslave now has the missing libraries and will warn us if block/rbd.c
> breaks again.  Kevin has also installed the package so his local builds
> exercise the code.
> 
> The mingw build is already failing in buildbot due to an unrelated issue.  The
> bdrv_file_open() prototype warning was not spotted amongst all the other
> warnings.
> 
> The following changes since commit fe6344a05fba26e16863fefcb823242e579b0991:
> 
>   Remove device_tree.o from hw/moxie/Makefile.objs. (2013-03-24 11:30:04 +0100)
> 
> are available in the git repository at:
> 
>   git://github.com/stefanha/qemu.git block
> 
> for you to fetch changes up to ea804cadf867a0521b9069193db339d041a40689:
> 
>   block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build) (2013-03-25 09:53:04 +0100)

Tested, and this fixes the build failure of rbd for me.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top

Re: [Qemu-devel] [PULL 0/2] Block patches

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 876 bytes --]

On 03/25/2013 05:00 AM, Stefan Hajnoczi wrote:
> This tiny pull request contains build fixes for a regression introduced in the
> last pull request.
> 
> Kevin and I investigated to find out why these build failures were missed.
> Both my buildslave and Kevin's workstation did not have the rbd libraries
> installed so block/rbd.c was not built.
> 
> The buildslave now has the missing libraries and will warn us if block/rbd.c
> breaks again.  Kevin has also installed the package so his local builds
> exercise the code.
> 
> The mingw build is already failing in buildbot due to an unrelated issue.  The
> bdrv_file_open() prototype warning was not spotted amongst all the other
> warnings.

Series: Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]