Skip to contentSkip to conversation

Block patches

GIT PULL New Stefan Hajnoczi 3 participants 5 messages Mar 25, 2013 Block layer

lore
Share & tools
lore
#0 lore raw

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(-)
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/2 rbd: fix compile error

From: Liu Yuan <[email protected]>

Commit 787e4a85 [block: Add options QDict to bdrv_file_open() prototypes] didn't update rbd.c accordingly.

---
 block/rbd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
block/rbd.c +2 -1
index 8cd10a7..1a8ea6d 100644
@@ -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];
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH 2/2 block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build)

In reply to Stefan Hajnoczi

From: Stefan Weil <[email protected]>

The new parameter is unused yet.

This part was missing in commit 787e4a8500020695eb391e2f1cc4767ee071d441.

---
 block/raw-win32.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
block/raw-win32.c +4 -2
index 18e0068..ece2f1a 100644
@@ -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;
Signature · 1 line
1.8.1.4
#3 lore raw
In reply to Stefan Hajnoczi
Quoted 19 lines · 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)

Quoted 7 lines

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.

Signature · 4 lines
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
#4 lore raw
In reply to Stefan Hajnoczi
Quoted 7 lines · 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.

Quoted 7 lines

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 <[email protected]>

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