| Message ID | 1357139756-11951-1-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
Stefan Hajnoczi <stefanha@redhat.com> writes: > Paolo's include/ reorganization was merged and this pull request had conflicts. > Resolved in v2. > > The following changes since commit 5928023cef87847a295035487397b9ec701fdd6b: > > pflash_cfi01: Suppress warning when Linux probes for AMD flash (2013-01-01 13:05:57 +0100) > > are available in the git repository at: > > git://github.com/stefanha/qemu.git block > Pulled. Thanks. Regards, Anthony Liguori > for you to fetch changes up to d6b1ef89a1ede41334e4d0fa27e600e0b4d4f209: > > sheepdog: pass oid directly to send_pending_req() (2013-01-02 16:09:00 +0100) > > ---------------------------------------------------------------- > Alexey Zaytsev (1): > virtio-blk: Return UNSUPP for unknown request types > > Liu Yuan (2): > sheepdog: don't update inode when create_and_write fails > sheepdog: pass oid directly to send_pending_req() > > Stefan Hajnoczi (12): > raw-posix: add raw_get_aio_fd() for virtio-blk-data-plane > configure: add CONFIG_VIRTIO_BLK_DATA_PLANE > dataplane: add host memory mapping code > dataplane: add virtqueue vring code > dataplane: add event loop > dataplane: add Linux AIO request queue > iov: add iov_discard_front/back() to remove data > test-iov: add iov_discard_front/back() testcases > iov: add qemu_iovec_concat_iov() > virtio-blk: restore VirtIOBlkConf->config_wce flag > dataplane: add virtio-blk data plane code > virtio-blk: add x-data-plane=on|off performance feature > > Stefan Weil (1): > block/raw-win32: Fix compiler warnings (wrong format specifiers) > > liguang (2): > cutils: change strtosz_suffix_unit function > qemu-img: report size overflow error message > > block/raw-posix.c | 34 ++++ > block/raw-win32.c | 4 +- > block/sheepdog.c | 11 +- > configure | 21 ++ > cutils.c | 6 +- > hw/Makefile.objs | 2 +- > hw/dataplane/Makefile.objs | 3 + > hw/dataplane/event-poll.c | 100 ++++++++++ > hw/dataplane/event-poll.h | 40 ++++ > hw/dataplane/hostmem.c | 176 +++++++++++++++++ > hw/dataplane/hostmem.h | 57 ++++++ > hw/dataplane/ioq.c | 117 ++++++++++++ > hw/dataplane/ioq.h | 57 ++++++ > hw/dataplane/virtio-blk.c | 465 +++++++++++++++++++++++++++++++++++++++++++++ > hw/dataplane/virtio-blk.h | 29 +++ > hw/dataplane/vring.c | 362 +++++++++++++++++++++++++++++++++++ > hw/dataplane/vring.h | 62 ++++++ > hw/virtio-blk.c | 53 +++++- > hw/virtio-blk.h | 5 +- > hw/virtio-pci.c | 4 + > include/block/block.h | 9 + > include/qemu-common.h | 3 + > include/qemu/iov.h | 13 ++ > iov.c | 90 +++++++-- > qemu-img.c | 10 +- > tests/test-iov.c | 150 +++++++++++++++ > trace-events | 9 + > 27 files changed, 1863 insertions(+), 29 deletions(-) > create mode 100644 hw/dataplane/Makefile.objs > create mode 100644 hw/dataplane/event-poll.c > create mode 100644 hw/dataplane/event-poll.h > create mode 100644 hw/dataplane/hostmem.c > create mode 100644 hw/dataplane/hostmem.h > create mode 100644 hw/dataplane/ioq.c > create mode 100644 hw/dataplane/ioq.h > create mode 100644 hw/dataplane/virtio-blk.c > create mode 100644 hw/dataplane/virtio-blk.h > create mode 100644 hw/dataplane/vring.c > create mode 100644 hw/dataplane/vring.h > > -- > 1.8.0.2
Paolo's include/ reorganization was merged and this pull request had conflicts. Resolved in v2. The following changes since commit 5928023cef87847a295035487397b9ec701fdd6b: pflash_cfi01: Suppress warning when Linux probes for AMD flash (2013-01-01 13:05:57 +0100) are available in the git repository at: git://github.com/stefanha/qemu.git block for you to fetch changes up to d6b1ef89a1ede41334e4d0fa27e600e0b4d4f209: sheepdog: pass oid directly to send_pending_req() (2013-01-02 16:09:00 +0100) ---------------------------------------------------------------- Alexey Zaytsev (1): virtio-blk: Return UNSUPP for unknown request types Liu Yuan (2): sheepdog: don't update inode when create_and_write fails sheepdog: pass oid directly to send_pending_req() Stefan Hajnoczi (12): raw-posix: add raw_get_aio_fd() for virtio-blk-data-plane configure: add CONFIG_VIRTIO_BLK_DATA_PLANE dataplane: add host memory mapping code dataplane: add virtqueue vring code dataplane: add event loop dataplane: add Linux AIO request queue iov: add iov_discard_front/back() to remove data test-iov: add iov_discard_front/back() testcases iov: add qemu_iovec_concat_iov() virtio-blk: restore VirtIOBlkConf->config_wce flag dataplane: add virtio-blk data plane code virtio-blk: add x-data-plane=on|off performance feature Stefan Weil (1): block/raw-win32: Fix compiler warnings (wrong format specifiers) liguang (2): cutils: change strtosz_suffix_unit function qemu-img: report size overflow error message block/raw-posix.c | 34 ++++ block/raw-win32.c | 4 +- block/sheepdog.c | 11 +- configure | 21 ++ cutils.c | 6 +- hw/Makefile.objs | 2 +- hw/dataplane/Makefile.objs | 3 + hw/dataplane/event-poll.c | 100 ++++++++++ hw/dataplane/event-poll.h | 40 ++++ hw/dataplane/hostmem.c | 176 +++++++++++++++++ hw/dataplane/hostmem.h | 57 ++++++ hw/dataplane/ioq.c | 117 ++++++++++++ hw/dataplane/ioq.h | 57 ++++++ hw/dataplane/virtio-blk.c | 465 +++++++++++++++++++++++++++++++++++++++++++++ hw/dataplane/virtio-blk.h | 29 +++ hw/dataplane/vring.c | 362 +++++++++++++++++++++++++++++++++++ hw/dataplane/vring.h | 62 ++++++ hw/virtio-blk.c | 53 +++++- hw/virtio-blk.h | 5 +- hw/virtio-pci.c | 4 + include/block/block.h | 9 + include/qemu-common.h | 3 + include/qemu/iov.h | 13 ++ iov.c | 90 +++++++-- qemu-img.c | 10 +- tests/test-iov.c | 150 +++++++++++++++ trace-events | 9 + 27 files changed, 1863 insertions(+), 29 deletions(-) create mode 100644 hw/dataplane/Makefile.objs create mode 100644 hw/dataplane/event-poll.c create mode 100644 hw/dataplane/event-poll.h create mode 100644 hw/dataplane/hostmem.c create mode 100644 hw/dataplane/hostmem.h create mode 100644 hw/dataplane/ioq.c create mode 100644 hw/dataplane/ioq.h create mode 100644 hw/dataplane/virtio-blk.c create mode 100644 hw/dataplane/virtio-blk.h create mode 100644 hw/dataplane/vring.c create mode 100644 hw/dataplane/vring.h