diff options
| author | Peter Maydell | 2014-10-22 17:39:49 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-10-22 17:39:49 +0200 |
| commit | 8f4699d873bef81cec95db6da53d4c33f8caf4b9 (patch) | |
| tree | 249e2a7bb71c26b66643162f98e2659d83c79d4d /hw/arm/highbank.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20141015-2' into s... (diff) | |
| parent | block: Make device model's references to BlockBackend strong (diff) | |
| download | qemu-8f4699d873bef81cec95db6da53d4c33f8caf4b9.tar.gz qemu-8f4699d873bef81cec95db6da53d4c33f8caf4b9.tar.xz qemu-8f4699d873bef81cec95db6da53d4c33f8caf4b9.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches
# gpg: Signature made Mon 20 Oct 2014 13:04:09 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream: (28 commits)
block: Make device model's references to BlockBackend strong
block: Lift device model API into BlockBackend
blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend
block/qapi: Convert qmp_query_block() to BlockBackend
blockdev: Fix blockdev-add not to create DriveInfo
blockdev: Drop superfluous DriveInfo member id
pc87312: Drop unused members of PC87312State
ide: Complete conversion from BlockDriverState to BlockBackend
hw: Convert from BlockDriverState to BlockBackend, mostly
virtio-blk: Rename VirtIOBlkConf variables to conf
virtio-blk: Drop redundant VirtIOBlock member conf
block: Rename BlockDriverCompletionFunc to BlockCompletionFunc
block: Rename BlockDriverAIOCB* to BlockAIOCB*
block: Eliminate DriveInfo member bdrv, use blk_by_legacy_dinfo()
block: Merge BlockBackend and BlockDriverState name spaces
block: Eliminate BlockDriverState member device_name[]
block: Eliminate bdrv_iterate(), use bdrv_next()
blockdev: Eliminate drive_del()
block: Make BlockBackend own its BlockDriverState
block: Code motion to get rid of stubs/blockdev.c
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/highbank.c')
| -rw-r--r-- | hw/arm/highbank.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index fa61e5fa13..30f744a1bd 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -24,7 +24,7 @@ #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "sysemu/blockdev.h" +#include "sysemu/block-backend.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" |