diff options
| author | Peter Maydell | 2016-07-21 12:00:36 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-21 12:00:36 +0200 |
| commit | 61ead113ae53a4dae63b5377ace1300cb8705682 (patch) | |
| tree | 7bce8156491303346fd6ff82504f074b71b8cb84 /hw/intc/ioapic.c | |
| parent | Revert e5dfc5e8e("Move README to markdown") (diff) | |
| parent | raw_bsd: Convert to byte-based interface (diff) | |
| download | qemu-61ead113ae53a4dae63b5377ace1300cb8705682.tar.gz qemu-61ead113ae53a4dae63b5377ace1300cb8705682.tar.xz qemu-61ead113ae53a4dae63b5377ace1300cb8705682.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
v2:
* Resolved merge conflict with block/iscsi.c [Peter]
# gpg: Signature made Wed 20 Jul 2016 17:20:52 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request: (25 commits)
raw_bsd: Convert to byte-based interface
nbd: Convert to byte-based interface
block: Kill .bdrv_co_discard()
sheepdog: Switch .bdrv_co_discard() to byte-based
raw_bsd: Switch .bdrv_co_discard() to byte-based
qcow2: Switch .bdrv_co_discard() to byte-based
nbd: Switch .bdrv_co_discard() to byte-based
iscsi: Switch .bdrv_co_discard() to byte-based
gluster: Switch .bdrv_co_discard() to byte-based
blkreplay: Switch .bdrv_co_discard() to byte-based
block: Add .bdrv_co_pdiscard() driver callback
block: Convert .bdrv_aio_discard() to byte-based
rbd: Switch rbd_start_aio() to byte-based
raw-posix: Switch paio_submit() to byte-based
block: Convert BB interface to byte-based discards
block: Convert bdrv_aio_discard() to byte-based
block: Switch BlockRequest to byte-based
block: Convert bdrv_discard() to byte-based
block: Convert bdrv_co_discard() to byte-based
iscsi: Rely on block layer to break up large requests
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Conflicts:
block/gluster.c
Diffstat (limited to 'hw/intc/ioapic.c')
0 files changed, 0 insertions, 0 deletions