| Message ID | 1404204537-5082-1-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 1 July 2014 09:48, Stefan Hajnoczi <stefanha@redhat.com> wrote: > The following changes since commit 53a259da5697ec8a82463161e2e32ff942a08bc2: > > Merge remote-tracking branch 'remotes/awilliam/tags/vfio-pci-for-qemu-20140630.0' into staging (2014-06-30 18:31:07 +0100) > > are available in the git repository at: > > > git://github.com/stefanha/qemu.git tags/block-pull-request > > for you to fetch changes up to 13d8cc515dfcf5574077f964332d34890c0101d0: > > block: add backing-file option to block-stream (2014-07-01 10:47:01 +0200) > Applied, thanks. -- PMM
The following changes since commit 53a259da5697ec8a82463161e2e32ff942a08bc2: Merge remote-tracking branch 'remotes/awilliam/tags/vfio-pci-for-qemu-20140630.0' into staging (2014-06-30 18:31:07 +0100) are available in the git repository at: git://github.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 13d8cc515dfcf5574077f964332d34890c0101d0: block: add backing-file option to block-stream (2014-07-01 10:47:01 +0200) ---------------------------------------------------------------- Block pull request ---------------------------------------------------------------- Benoît Canet (1): qapi: Change back sector-count to sectors-count in quorum QAPI events. Chunyan Liu (1): qemu-img create: add 'nocow' option Cornelia Huck (1): dataplane: bail out on unsupported transport Jeff Cody (6): block: make 'top' argument to block-commit optional block: simplify bdrv_find_base() and bdrv_find_overlay() block: add QAPI command to allow live backing file change block: add helper function to determine if a BDS is in a chain block: extend block-commit to accept a string for the backing file block: add backing-file option to block-stream Max Reitz (3): iotests: Simplify qemu-iotests-quick.sh iotests: Add qemu tests to quick group iotests: Add more tests to quick group Peter Maydell (1): block/cow: Avoid use of uninitialized cow_bs in error path Stefan Hajnoczi (11): qom: add object_property_add_alias() virtio-blk: avoid qdev property definition duplication virtio-blk: move x-data-plane qdev property to virtio-blk.h qdev: add qdev_alias_all_properties() virtio-blk: use aliases instead of duplicate qdev properties virtio-blk: drop virtio_blk_set_conf() virtio: fix virtio-blk child refcount in transports virtio-blk: move qdev properties into virtio-blk.c virtio-blk: replace x-iothread with iothread link property qdev: drop iothread property type virtio-blk: remove need for explicit x-data-plane=on option block.c | 64 +++++++++----------- block/commit.c | 9 ++- block/cow.c | 7 ++- block/qed.c | 6 +- block/raw-posix.c | 25 ++++++++ block/stream.c | 11 ++-- block/vdi.c | 29 +++++++++ block/vmdk.c | 6 +- block/vpc.c | 29 +++++++++ blockdev.c | 126 ++++++++++++++++++++++++++++++++++++--- docs/qmp/qmp-events.txt | 26 ++++---- hmp.c | 2 +- hw/block/dataplane/virtio-blk.c | 12 +++- hw/block/virtio-blk.c | 28 ++++++--- hw/core/qdev-properties-system.c | 50 ---------------- hw/core/qdev.c | 21 +++++++ hw/s390x/s390-virtio-bus.c | 12 ++-- hw/s390x/s390-virtio-bus.h | 1 - hw/s390x/virtio-ccw.c | 9 ++- hw/s390x/virtio-ccw.h | 1 - hw/virtio/virtio-pci.c | 9 ++- hw/virtio/virtio-pci.h | 1 - include/block/block.h | 4 +- include/block/block_int.h | 4 +- include/hw/qdev-properties.h | 5 +- include/hw/virtio/virtio-blk.h | 19 ------ include/qom/object.h | 20 +++++++ qapi/block-core.json | 72 +++++++++++++++++++--- qapi/event.json | 8 +-- qemu-doc.texi | 16 +++++ qemu-img.texi | 16 +++++ qmp-commands.hx | 63 +++++++++++++++++++- qom/object.c | 51 ++++++++++++++++ tests/qemu-iotests-quick.sh | 12 +--- tests/qemu-iotests/040 | 28 +++++---- tests/qemu-iotests/082.out | 24 ++++++++ tests/qemu-iotests/group | 56 ++++++++--------- 37 files changed, 640 insertions(+), 242 deletions(-)