diff options
Diffstat (limited to 'hw/block')
-rw-r--r-- | hw/block/dataplane/virtio-blk.c | 1 | ||||
-rw-r--r-- | hw/block/dataplane/xen-block.c | 2 | ||||
-rw-r--r-- | hw/block/ecc.c | 2 | ||||
-rw-r--r-- | hw/block/fdc.c | 5 | ||||
-rw-r--r-- | hw/block/m25p80.c | 3 | ||||
-rw-r--r-- | hw/block/nand.c | 3 | ||||
-rw-r--r-- | hw/block/nvme.c | 3 | ||||
-rw-r--r-- | hw/block/onenand.c | 2 | ||||
-rw-r--r-- | hw/block/pflash_cfi01.c | 5 | ||||
-rw-r--r-- | hw/block/pflash_cfi02.c | 3 | ||||
-rw-r--r-- | hw/block/tc58128.c | 1 | ||||
-rw-r--r-- | hw/block/vhost-user-blk.c | 3 | ||||
-rw-r--r-- | hw/block/virtio-blk.c | 4 | ||||
-rw-r--r-- | hw/block/xen-block.c | 3 |
14 files changed, 29 insertions, 11 deletions
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 158c78f852..9299a1a7c2 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "trace.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qemu/thread.h" #include "qemu/error-report.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c index 0f200c5fb0..3b9caeb2fa 100644 --- a/hw/block/dataplane/xen-block.c +++ b/hw/block/dataplane/xen-block.c @@ -20,8 +20,8 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/xen/xen_common.h" #include "hw/block/xen_blkif.h" #include "sysemu/block-backend.h" diff --git a/hw/block/ecc.c b/hw/block/ecc.c index 48311d2609..1a182367ee 100644 --- a/hw/block/ecc.c +++ b/hw/block/ecc.c @@ -12,7 +12,7 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" +#include "migration/vmstate.h" #include "hw/block/flash.h" /* diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 9b24cb9b85..ac5d31e8c1 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -28,18 +28,21 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/block/fdc.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/block/block.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index dd87affcf5..47159de3a4 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -23,9 +23,10 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "sysemu/block-backend.h" +#include "hw/qdev-properties.h" #include "hw/ssi/ssi.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/block/nand.c b/hw/block/nand.c index 0a2736b50e..e396004315 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -20,9 +20,10 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "sysemu/block-backend.h" -#include "hw/qdev.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 36d6a8bb3a..12d8254250 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -28,9 +28,10 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/block/block.h" -#include "hw/hw.h" #include "hw/pci/msix.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/block/onenand.c b/hw/block/onenand.c index b3644f7e89..fcc5a69b90 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -23,9 +23,11 @@ #include "hw/hw.h" #include "hw/block/flash.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "sysemu/block-backend.h" #include "exec/memory.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index a1ec1faae5..566c0acb77 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -37,9 +37,9 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/block/block.h" #include "hw/block/flash.h" +#include "hw/qdev-properties.h" #include "sysemu/block-backend.h" #include "qapi/error.h" #include "qemu/timer.h" @@ -50,8 +50,9 @@ #include "qemu/module.h" #include "qemu/option.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/blockdev.h" -#include "sysemu/sysemu.h" +#include "sysemu/runstate.h" #include "trace.h" /* #define PFLASH_DEBUG */ diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 42886f6af5..4baca701b7 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -33,9 +33,9 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/block/block.h" #include "hw/block/flash.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/bitmap.h" #include "qemu/timer.h" @@ -43,6 +43,7 @@ #include "qemu/host-utils.h" #include "qemu/module.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #define PFLASH_DEBUG false diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index d0fae248dc..9888f01ac6 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/sh4/sh.h" #include "hw/loader.h" #include "sysemu/qtest.h" diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 85bc4017e7..0b8c5dfeab 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -22,11 +22,14 @@ #include "qemu/cutils.h" #include "qom/object.h" #include "hw/qdev-core.h" +#include "hw/qdev-properties.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-user-blk.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" +#include "sysemu/sysemu.h" +#include "sysemu/runstate.h" static const int user_feature_bits[] = { VIRTIO_BLK_F_SIZE_MAX, diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index cbb3729158..18851601cb 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -18,7 +18,10 @@ #include "qemu/error-report.h" #include "trace.h" #include "hw/block/block.h" +#include "hw/qdev-properties.h" #include "sysemu/blockdev.h" +#include "sysemu/sysemu.h" +#include "sysemu/runstate.h" #include "hw/virtio/virtio-blk.h" #include "dataplane/virtio-blk.h" #include "scsi/constants.h" @@ -26,6 +29,7 @@ # include <scsi/sg.h> #endif #include "hw/virtio/virtio-bus.h" +#include "migration/qemu-file-types.h" #include "hw/virtio/virtio-access.h" /* Config size before the discard support (hide associated config fields) */ diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 69d73196e2..f77343db60 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -7,6 +7,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/option.h" #include "qapi/error.h" @@ -17,9 +18,9 @@ #include "qapi/visitor.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" -#include "hw/hw.h" #include "hw/xen/xen_common.h" #include "hw/block/xen_blkif.h" +#include "hw/qdev-properties.h" #include "hw/xen/xen-block.h" #include "hw/xen/xen-backend.h" #include "sysemu/blockdev.h" |