diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-24 15:28:36 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-24 15:28:36 +0000 |
| commit | 25bfd5a75fa3e8f5796656c7634e26193f7bedc1 (patch) | |
| tree | e8c02a7393555643add8e3b2f4be6b8a015c7ca8 /hw/arm/bcm2835_peripherals.c | |
| parent | 238e2d93c9ddc9bc6b5392289bed38a4ebff004d (diff) | |
| parent | bcbb3866da19cce4360c828b6ec1c2a137757927 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
v2:
* Drop merge failure from a previous pull request that broke virtio-blk on ARM
guests
* Add Parallels XML patch series
# gpg: Signature made Mon 22 Jan 2018 16:00:40 GMT
# 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:
block/parallels: add backing support to readv/writev
block/parallels: replace some magic numbers
block/parallels: move some structures into header
configure: add dependency
docs/interop/prl-xml: description of Parallels Disk format
block: add block_set_io_throttle virtio-blk-pci QMP example
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/bcm2835_peripherals.c')
0 files changed, 0 insertions, 0 deletions