| Message ID | 1410173509-26667-1-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 8 September 2014 11:51, Stefan Hajnoczi <stefanha@redhat.com> wrote: > v2: > * Dropped Fam's dataplane virtio header patches that break win32 build [Peter] > > The following changes since commit f102f224556f292f55b6e25147741bb8c48c9451: > > Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging (2014-09-05 16:03:56 +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 01ce352e62c3f86df6f4ad32c3ab9353e55af799: > > ide: Add resize callback to ide/core (2014-09-08 11:12:44 +0100) > Applied, thanks. -- PMM
v2: * Dropped Fam's dataplane virtio header patches that break win32 build [Peter] The following changes since commit f102f224556f292f55b6e25147741bb8c48c9451: Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging (2014-09-05 16:03:56 +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 01ce352e62c3f86df6f4ad32c3ab9353e55af799: ide: Add resize callback to ide/core (2014-09-08 11:12:44 +0100) ---------------------------------------------------------------- Block pull request ---------------------------------------------------------------- Chrysostomos Nanakos (1): block/archipelago: Use QEMU atomic builtins John Snow (5): libqos: add a simple first-fit memory allocator qtest/ide: Uninitialize PC allocator ide: Add wwn support to IDE-ATAPI drive IDE: Fill the IDENTIFY request consistently ide: Add resize callback to ide/core Laszlo Ersek (2): pflash_cfi01: fixup stale DPRINTF() calls pflash_cfi01: write flash contents to bdrv on incoming migration Liu Yuan (1): block: kill tail whitespace in block.c MORITA Kazutaka (1): MAINTAINERS: update sheepdog maintainer Marc Marí (7): tests: Functions bus_foreach and device_find from libqos virtio API tests: Add virtio device initialization libqos: Added basic virtqueue support to virtio implementation libqos: Added indirect descriptor support to virtio implementation libqos: Added test case for configuration changes in virtio-blk test libqos: Added MSI-X support libqos: Added EVENT_IDX support Peter Lieven (3): rename parse_enum_option to qapi_enum_parse and make it public qemu-nbd: add option to set detect-zeroes mode qemu-nbd: fix indentation and coding style Stefan Hajnoczi (4): qemu-img: clarify src_cache option documentation qemu-img: fix rebase src_cache option documentation vmdk: fix vmdk_parse_extents() extent_file leaks vmdk: fix buf leak in vmdk_parse_extents() MAINTAINERS | 2 +- block.c | 2 +- block/archipelago.c | 76 ++---- block/vmdk.c | 4 +- blockdev.c | 30 +-- hw/block/pflash_cfi01.c | 18 +- hw/ide/core.c | 111 ++++++-- include/qapi/util.h | 17 ++ qapi/Makefile.objs | 2 +- qapi/qapi-util.c | 34 +++ qemu-img.c | 3 +- qemu-img.texi | 7 +- qemu-nbd.c | 100 +++++--- tests/Makefile | 3 +- tests/ide-test.c | 2 + tests/libqos/malloc-pc.c | 280 +++++++++++++++++++- tests/libqos/malloc-pc.h | 9 + tests/libqos/pci.c | 111 +++++++- tests/libqos/pci.h | 10 + tests/libqos/virtio-pci.c | 343 +++++++++++++++++++++++++ tests/libqos/virtio-pci.h | 61 +++++ tests/libqos/virtio.c | 257 +++++++++++++++++++ tests/libqos/virtio.h | 182 +++++++++++++ tests/libqtest.c | 48 ++++ tests/libqtest.h | 7 + tests/virtio-blk-test.c | 640 +++++++++++++++++++++++++++++++++++++++++++++- 26 files changed, 2192 insertions(+), 167 deletions(-) create mode 100644 include/qapi/util.h create mode 100644 qapi/qapi-util.c create mode 100644 tests/libqos/virtio-pci.c create mode 100644 tests/libqos/virtio-pci.h create mode 100644 tests/libqos/virtio.c create mode 100644 tests/libqos/virtio.h