block: Clean up includes
v2 cover block: Clean up includes
Based-on: <[email protected]>
v2:
* Rebased
* PATCH 1: Comment typo fixed [Paolo]
Markus Armbruster (3):
include/block: Untangle inclusion loops hw/sparc64/niagara: Use blk_name() instead of open-coding it include/hw/block: Include hw/block/block.h where needed
include/block/block-common.h | 9 ++------- include/block/block-copy.h | 4 ++-- include/block/block-global-state.h | 4 +++- include/block/block-hmp-cmds.h | 2 ++ include/block/block-io.h | 5 ++++- include/block/block.h | 4 ++-- include/block/block_backup.h | 2 +- include/block/block_int-common.h | 14 +++++--------- include/block/block_int-global-state.h | 5 ++++- include/block/block_int-io.h | 4 +++- include/block/block_int.h | 4 ++-- include/block/blockjob.h | 2 +- include/block/blockjob_int.h | 1 - include/block/dirty-bitmap.h | 1 + include/block/qapi.h | 2 +- include/block/thread-pool.h | 2 +- include/block/throttle-groups.h | 2 +- include/hw/block/swim.h | 1 + include/sysemu/block-backend-io.h | 1 + block.c | 1 + block/amend.c | 1 + block/backup.c | 1 + block/blkdebug.c | 1 + block/blklogwrites.c | 1 + block/blkreplay.c | 1 + block/blkverify.c | 1 + block/block-copy.c | 4 ++++ block/bochs.c | 1 + block/cloop.c | 1 + block/copy-before-write.c | 1 + block/copy-on-read.c | 1 + block/curl.c | 1 + block/dirty-bitmap.c | 2 ++ block/dmg.c | 1 + block/export/fuse.c | 3 ++- block/file-posix.c | 1 + block/file-win32.c | 1 + block/filter-compress.c | 1 + block/gluster.c | 1 + block/io.c | 1 + block/iscsi.c | 1 + block/mirror.c | 1 + block/monitor/bitmap-qmp-cmds.c | 2 ++ block/nfs.c | 1 + block/null.c | 1 + block/nvme.c | 1 + block/parallels-ext.c | 2 ++ block/preallocate.c | 1 + block/qapi-sysemu.c | 1 + block/qapi.c | 1 + block/qcow2-bitmap.c | 2 ++ block/qcow2-cache.c | 1 + block/qcow2-cluster.c | 1 + block/qcow2-refcount.c | 1 + block/qcow2-threads.c | 1 + block/qcow2.c | 1 + block/qed-check.c | 1 + block/qed-table.c | 1 + block/raw-format.c | 1 + block/rbd.c | 1 + block/ssh.c | 1 + block/throttle.c | 2 ++ block/vhdx-log.c | 1 + block/vvfat.c | 1 + block/win32-aio.c | 1 + block/write-threshold.c | 1 + blockdev.c | 1 + blockjob.c | 1 + hw/block/block.c | 1 + hw/sparc64/niagara.c | 5 ++--- hw/virtio/virtio-pmem.c | 1 + migration/block-dirty-bitmap.c | 1 + migration/block.c | 1 + migration/savevm.c | 1 + monitor/qmp-cmds.c | 1 + nbd/server.c | 2 ++ qemu-img.c | 1 + softmmu/cpus.c | 1 + softmmu/physmem.c | 1 + storage-daemon/qemu-storage-daemon.c | 1 + target/i386/kvm/kvm.c | 1 + tests/unit/test-bdrv-drain.c | 2 +- tests/unit/test-block-iothread.c | 1 + scripts/block-coroutine-wrapper.py | 3 ++- 84 files changed, 114 insertions(+), 38 deletions(-)
Signature · 1 line
2.38.1
PATCH v2 1/3 include/block: Untangle inclusion loops
We have two inclusion loops:
block/block.h
-> block/block-global-state.h
-> block/block-common.h
-> block/blockjob.h
-> block/block.h
block/block.h
-> block/block-io.h
-> block/block-common.h
-> block/blockjob.h
-> block/block.hI believe these go back to Emanuele's reorganization of the block API, merged a few months ago in commit d7e2fe4aac8.
Fortunately, breaking them is merely a matter of deleting unnecessary includes from headers, and adding them back in places where they are now missing.
--- include/block/block-common.h | 9 ++------- include/block/block-copy.h | 4 ++-- include/block/block-global-state.h | 4 +++- include/block/block-hmp-cmds.h | 2 ++ include/block/block-io.h | 5 ++++- include/block/block.h | 4 ++-- include/block/block_backup.h | 2 +- include/block/block_int-common.h | 14 +++++--------- include/block/block_int-global-state.h | 5 ++++- include/block/block_int-io.h | 4 +++- include/block/block_int.h | 4 ++-- include/block/blockjob.h | 2 +- include/block/blockjob_int.h | 1 - include/block/dirty-bitmap.h | 1 + include/block/qapi.h | 2 +- include/block/thread-pool.h | 2 +- include/block/throttle-groups.h | 2 +- include/sysemu/block-backend-io.h | 1 + block.c | 1 + block/amend.c | 1 + block/backup.c | 1 + block/blkdebug.c | 1 + block/blklogwrites.c | 1 + block/blkreplay.c | 1 + block/blkverify.c | 1 + block/block-copy.c | 4 ++++ block/bochs.c | 1 + block/cloop.c | 1 + block/copy-before-write.c | 1 + block/copy-on-read.c | 1 + block/curl.c | 1 + block/dirty-bitmap.c | 2 ++ block/dmg.c | 1 + block/export/fuse.c | 3 ++- block/file-posix.c | 1 + block/file-win32.c | 1 + block/filter-compress.c | 1 + block/gluster.c | 1 + block/io.c | 1 + block/iscsi.c | 1 + block/mirror.c | 1 + block/monitor/bitmap-qmp-cmds.c | 2 ++ block/nfs.c | 1 + block/null.c | 1 + block/nvme.c | 1 + block/parallels-ext.c | 2 ++ block/preallocate.c | 1 + block/qapi-sysemu.c | 1 + block/qapi.c | 1 + block/qcow2-bitmap.c | 2 ++ block/qcow2-cache.c | 1 + block/qcow2-cluster.c | 1 + block/qcow2-refcount.c | 1 + block/qcow2-threads.c | 1 + block/qcow2.c | 1 + block/qed-check.c | 1 + block/qed-table.c | 1 + block/raw-format.c | 1 + block/rbd.c | 1 + block/ssh.c | 1 + block/throttle.c | 2 ++ block/vhdx-log.c | 1 + block/vvfat.c | 1 + block/win32-aio.c | 1 + block/write-threshold.c | 1 + blockdev.c | 1 + blockjob.c | 1 + hw/block/block.c | 1 + hw/sparc64/niagara.c | 1 + hw/virtio/virtio-pmem.c | 1 + migration/block-dirty-bitmap.c | 1 + migration/block.c | 1 + migration/savevm.c | 1 + monitor/qmp-cmds.c | 1 + nbd/server.c | 2 ++ qemu-img.c | 1 + softmmu/cpus.c | 1 + softmmu/physmem.c | 1 + storage-daemon/qemu-storage-daemon.c | 1 + target/i386/kvm/kvm.c | 1 + tests/unit/test-bdrv-drain.c | 2 +- tests/unit/test-block-iothread.c | 1 + scripts/block-coroutine-wrapper.py | 3 ++- 83 files changed, 112 insertions(+), 35 deletions(-)
include/block/block-common.h +2 -7
@@ -24,12 +24,8 @@#ifndef BLOCK_COMMON_H #define BLOCK_COMMON_H -#include "block/aio.h" -#include "block/aio-wait.h" -#include "qemu/iov.h" -#include "block/accounting.h" -#include "qemu/hbitmap.h" -#include "qemu/transactions.h" +#include "qapi/qapi-types-block-core.h" +#include "qemu/queue.h" /* * co_wrapper{*}: Function specifiers used by block-coroutine-wrapper.py
@@ -55,7 +51,6 @@#define co_wrapper_bdrv_rdlock#define co_wrapper_mixed_bdrv_rdlock -#include "block/dirty-bitmap.h" #include "block/blockjob.h" /* block.c */
include/block/block-copy.h +2 -2
@@ -15,8 +15,8 @@#ifndef BLOCK_COPY_H #define BLOCK_COPY_H -#include "block/block.h" -#include "qemu/co-shared-resource.h" +#include "block/block-common.h" +#include "qemu/progress_meter.h" /* All APIs are thread-safe */
include/block/block-global-state.h +3 -1
@@ -24,7 +24,9 @@#ifndef BLOCK_GLOBAL_STATE_H #define BLOCK_GLOBAL_STATE_H -#include "block-common.h" +#include "block/block-common.h" +#include "qemu/coroutine.h" +#include "qemu/transactions.h" /* * Global state (GS) API. These functions run under the BQL.
include/block/block-hmp-cmds.h +2 -0
@@ -15,6 +15,8 @@#ifndef BLOCK_BLOCK_HMP_CMDS_H #define BLOCK_BLOCK_HMP_CMDS_H +#include "qemu/coroutine.h" +void hmp_drive_add (Monitor *mon,const QDict *qdict);void hmp_commit (Monitor *mon,const QDict *qdict);
include/block/block-io.h +4 -1
@@ -24,7 +24,10 @@#ifndef BLOCK_IO_H #define BLOCK_IO_H -#include "block-common.h" +#include "block/aio-wait.h" +#include "block/block-common.h" +#include "qemu/coroutine.h" +#include "qemu/iov.h" /* * I/O API functions. These functions are thread-safe, and therefore
include/block/block.h +2 -2
@@ -24,8 +24,8 @@#ifndef BLOCK_H #define BLOCK_H -#include "block-global-state.h" -#include "block-io.h" +#include "block/block-global-state.h" +#include "block/block-io.h" /* DO NOT ADD ANYTHING IN HERE. USE ONE OF THE HEADERS INCLUDED ABOVE */
include/block/block_backup.h +1 -1
@@ -18,7 +18,7 @@#ifndef BLOCK_BACKUP_H #define BLOCK_BACKUP_H -#include "block/block_int.h" +#include "block/blockjob.h" void backup_do_checkpoint (BlockJob *job,Error **errp);
include/block/block_int-common.h +5 -9
@@ -24,17 +24,13 @@#ifndef BLOCK_INT_COMMON_H #define BLOCK_INT_COMMON_H -#include "block/accounting.h" -#include "block/block.h" -#include "block/aio-wait.h" -#include "qemu/queue.h" -#include "qemu/coroutine.h" -#include "qemu/stats64.h" -#include "qemu/timer.h" -#include "qemu/hbitmap.h" +#include "block/aio.h" +#include "block/block-common.h" +#include "block/block-global-state.h" #include "block/snapshot.h" -#include "qemu/throttle.h" +#include "qemu/iov.h" #include "qemu/rcu.h" +#include "qemu/stats64.h" #define BLOCK_FLAG_LAZY_REFCOUNTS 8
include/block/block_int-global-state.h +4 -1
@@ -25,7 +25,10 @@#ifndef BLOCK_INT_GLOBAL_STATE_H #define BLOCK_INT_GLOBAL_STATE_H -#include "block_int-common.h" +#include "block/blockjob.h" +#include "block/block_int-common.h" +#include "qemu/hbitmap.h" +#include "qemu/main-loop.h" /* * Global state (GS) API. These functions run under the BQL.
include/block/block_int-io.h +3 -1
@@ -24,7 +24,9 @@#ifndef BLOCK_INT_IO_H #define BLOCK_INT_IO_H -#include "block_int-common.h" +#include "block/block_int-common.h" +#include "qemu/hbitmap.h" +#include "qemu/main-loop.h" /* * I/O API functions. These functions are thread-safe.
include/block/block_int.h +2 -2
@@ -24,8 +24,8 @@#ifndef BLOCK_INT_H #define BLOCK_INT_H -#include "block_int-global-state.h" -#include "block_int-io.h" +#include "block/block_int-global-state.h" +#include "block/block_int-io.h" #include "block/graph-lock.h" /* DO NOT ADD ANYTHING IN HERE. USE ONE OF THE HEADERS INCLUDED ABOVE */
include/block/blockjob.h +1 -1
@@ -26,8 +26,8 @@#ifndef BLOCKJOB_H #define BLOCKJOB_H +#include "qapi/qapi-types-block-core.h" #include "qemu/job.h" -#include "block/block.h" #include "qemu/ratelimit.h" #define BLOCK_JOB_SLICE_TIME 100000000ULL/* ns */
include/block/blockjob_int.h +0 -1
@@ -27,7 +27,6 @@#define BLOCKJOB_INT_H #include "block/blockjob.h" -#include "block/block.h" /** * BlockJobDriver:
include/block/dirty-bitmap.h +1 -0
@@ -1,6 +1,7 @@#ifndef BLOCK_DIRTY_BITMAP_H #define BLOCK_DIRTY_BITMAP_H +#include "block/block-common.h" #include "qapi/qapi-types-block-core.h" #include "qemu/hbitmap.h"
include/block/qapi.h +1 -1
@@ -25,8 +25,8 @@#ifndef BLOCK_QAPI_H #define BLOCK_QAPI_H -#include "block/block.h" #include "block/snapshot.h" +#include "qapi/qapi-types-block-core.h" BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, BlockDriverState *bs,
include/block/thread-pool.h +1 -1
@@ -18,7 +18,7 @@#ifndef QEMU_THREAD_POOL_H #define QEMU_THREAD_POOL_H -#include "block/block.h" +#include "block/aio.h" #define THREAD_POOL_MAX_THREADS_DEFAULT 64
include/block/throttle-groups.h +1 -1
@@ -25,8 +25,8 @@#ifndef THROTTLE_GROUPS_H #define THROTTLE_GROUPS_H +#include "qemu/coroutine.h" #include "qemu/throttle.h" -#include "block/block_int.h" #include "qom/object.h" /* The ThrottleGroupMember structure indicates membership in a ThrottleGroup
include/sysemu/block-backend-io.h +1 -0
@@ -14,6 +14,7 @@#define BLOCK_BACKEND_IO_H #include "block-backend-common.h" +#include "block/accounting.h" /* * I/O API functions. These functions are thread-safe.
block.c +1 -0
@@ -27,6 +27,7 @@#include "block/trace.h" #include "block/block_int.h" #include "block/blockjob.h" +#include "block/dirty-bitmap.h" #include "block/fuse.h" #include "block/nbd.h" #include "block/qdict.h"
block/amend.c +1 -0
@@ -26,6 +26,7 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qemu/job.h" #include "qemu/main-loop.h"
block/backup.c +1 -0
@@ -20,6 +20,7 @@#include "block/blockjob_int.h" #include "block/block_backup.h" #include "block/block-copy.h" +#include "block/dirty-bitmap.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/cutils.h"
block/blkdebug.c +1 -0
@@ -27,6 +27,7 @@#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/config-file.h" +#include "block/block-io.h" #include "block/block_int.h" #include "block/qdict.h" #include "qemu/module.h"
block/blklogwrites.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/sockets.h" /* for EINPROGRESS on Windows */ +#include "block/block-io.h" #include "block/block_int.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
block/blkreplay.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "qemu/module.h" +#include "block/block-io.h" #include "block/block_int.h" #include "sysemu/replay.h" #include "qapi/error.h"
block/blkverify.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/sockets.h" /* for EINPROGRESS on Windows */ +#include "block/block-io.h" #include "block/block_int.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
block/block-copy.c +4 -0
@@ -17,10 +17,14 @@#include "trace.h" #include "qapi/error.h" #include "block/block-copy.h" +#include "block/block_int-io.h" +#include "block/dirty-bitmap.h" #include "block/reqlist.h" #include "sysemu/block-backend.h" #include "qemu/units.h" +#include "qemu/co-shared-resource.h" #include "qemu/coroutine.h" +#include "qemu/ratelimit.h" #include "block/aio_task.h" #include "qemu/error-report.h" #include "qemu/memalign.h"
block/bochs.c +1 -0
@@ -24,6 +24,7 @@*/ #include "qemu/osdep.h" #include "qapi/error.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qemu/module.h" #include "qemu/bswap.h"
block/cloop.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qemu/module.h" #include "qemu/bswap.h"
block/copy-before-write.c +1 -0
@@ -32,6 +32,7 @@#include "block/block_int.h" #include "block/qdict.h" #include "block/block-copy.h" +#include "block/dirty-bitmap.h" #include "block/copy-before-write.h" #include "block/reqlist.h"
block/copy-on-read.c +1 -0
@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qemu/module.h" #include "qapi/error.h"
block/curl.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/option.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
block/dirty-bitmap.c +2 -0
@@ -24,8 +24,10 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "trace.h" +#include "block/block-io.h" #include "block/block_int.h" #include "block/blockjob.h" +#include "block/dirty-bitmap.h" #include "qemu/main-loop.h" struct BdrvDirtyBitmap {
block/dmg.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" #include "qapi/error.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qemu/bswap.h" #include "qemu/error-report.h"
block/export/fuse.c +2 -1
@@ -21,12 +21,13 @@#include "qemu/osdep.h" #include "qemu/memalign.h" #include "block/aio.h" -#include "block/block.h" +#include "block/block_int-common.h" #include "block/export.h" #include "block/fuse.h" #include "block/qapi.h" #include "qapi/error.h" #include "qapi/qapi-commands-block.h" +#include "qemu/main-loop.h" #include "sysemu/block-backend.h" #include <fuse.h>
block/file-posix.c +1 -0
@@ -26,6 +26,7 @@#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qemu/module.h" #include "qemu/option.h"
block/file-win32.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/cutils.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qemu/module.h" #include "qemu/option.h"
block/filter-compress.c +1 -0
@@ -22,6 +22,7 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qemu/module.h" #include "qapi/error.h"
block/gluster.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "qemu/units.h" #include <glusterfs/api/glfs.h> +#include "block/block-io.h" #include "block/block_int.h" #include "block/qdict.h" #include "qapi/error.h"
block/io.c +1 -0
@@ -30,6 +30,7 @@#include "block/blockjob_int.h" #include "block/block_int.h" #include "block/coroutines.h" +#include "block/dirty-bitmap.h" #include "block/write-threshold.h" #include "qemu/cutils.h" #include "qemu/memalign.h"
block/iscsi.c +1 -0
@@ -33,6 +33,7 @@#include "qemu/error-report.h" #include "qemu/bitops.h" #include "qemu/bitmap.h" +#include "block/block-io.h" #include "block/block_int.h" #include "block/qdict.h" #include "scsi/constants.h"
block/mirror.c +1 -0
@@ -18,6 +18,7 @@#include "trace.h" #include "block/blockjob_int.h" #include "block/block_int.h" +#include "block/dirty-bitmap.h" #include "sysemu/block-backend.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h"
block/monitor/bitmap-qmp-cmds.c +2 -0
@@ -32,7 +32,9 @@#include "qemu/osdep.h" +#include "block/block-io.h" #include "block/block_int.h" +#include "block/dirty-bitmap.h" #include "qapi/qapi-commands-block.h" #include "qapi/error.h"
block/nfs.c +1 -0
@@ -30,6 +30,7 @@#include "qemu/config-file.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "block/block-io.h" #include "block/block_int.h" #include "block/qdict.h" #include "trace.h"
block/null.c +1 -0
@@ -16,6 +16,7 @@#include "qapi/qmp/qstring.h" #include "qemu/module.h" #include "qemu/option.h" +#include "block/block-io.h" #include "block/block_int.h" #include "sysemu/replay.h"
block/nvme.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/option.h" #include "qemu/memalign.h" #include "qemu/vfio-helpers.h" +#include "block/block-io.h" #include "block/block_int.h" #include "sysemu/replay.h" #include "trace.h"
block/parallels-ext.c +2 -0
@@ -25,7 +25,9 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "block/block-io.h" #include "block/block_int.h" +#include "block/dirty-bitmap.h" #include "parallels.h" #include "crypto/hash.h" #include "qemu/uuid.h"
block/preallocate.c +1 -0
@@ -30,6 +30,7 @@#include "qemu/module.h" #include "qemu/option.h" #include "qemu/units.h" +#include "block/block-io.h" #include "block/block_int.h"
block/qapi-sysemu.c +1 -0
@@ -32,6 +32,7 @@#include "qemu/osdep.h" +#include "block/block_int.h" #include "qapi/error.h" #include "qapi/qapi-commands-block.h" #include "qapi/qmp/qdict.h"
block/qapi.c +1 -0
@@ -26,6 +26,7 @@#include "qemu/cutils.h" #include "block/qapi.h" #include "block/block_int.h" +#include "block/dirty-bitmap.h" #include "block/throttle-groups.h" #include "block/write-threshold.h" #include "qapi/error.h"
block/qcow2-bitmap.c +2 -0
@@ -26,6 +26,8 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" +#include "block/dirty-bitmap.h" #include "qapi/error.h" #include "qemu/cutils.h"
block/qcow2-cache.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" #include "qemu/memalign.h" #include "qcow2.h" #include "trace.h"
block/qcow2-cluster.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include <zlib.h> +#include "block/block-io.h" #include "qapi/error.h" #include "qcow2.h" #include "qemu/bswap.h"
block/qcow2-refcount.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" #include "qapi/error.h" #include "qcow2.h" #include "qemu/range.h"
block/qcow2-threads.c +1 -0
@@ -34,6 +34,7 @@#endif #include "qcow2.h" +#include "block/block-io.h" #include "block/thread-pool.h" #include "crypto.h"
block/qcow2.c +1 -0
@@ -43,6 +43,7 @@#include "qapi/qapi-visit-block-core.h" #include "crypto.h" #include "block/aio_task.h" +#include "block/dirty-bitmap.h" /* Differences with QCOW:
block/qed-check.c +1 -0
@@ -12,6 +12,7 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" #include "qed.h" typedef struct {
block/qed-table.c +1 -0
@@ -13,6 +13,7 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" #include "trace.h" #include "qemu/sockets.h" /* for EINPROGRESS on Windows */ #include "qed.h"
block/raw-format.c +1 -0
@@ -27,6 +27,7 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qapi/error.h" #include "qemu/module.h"
block/rbd.c +1 -0
@@ -18,6 +18,7 @@#include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/option.h" +#include "block/block-io.h" #include "block/block_int.h" #include "block/qdict.h" #include "crypto/secret.h"
block/ssh.c +1 -0
@@ -27,6 +27,7 @@#include <libssh/libssh.h> #include <libssh/sftp.h> +#include "block/block-io.h" #include "block/block_int.h" #include "block/qdict.h" #include "qapi/error.h"
block/throttle.c +2 -0
@@ -18,6 +18,8 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" +#include "block/block_int.h" #include "block/throttle-groups.h" #include "qemu/module.h" #include "qemu/option.h"
block/vhdx-log.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "block/block-io.h" #include "block/block_int.h" #include "qemu/error-report.h" #include "qemu/bswap.h"
block/vvfat.c +1 -0
@@ -27,6 +27,7 @@#include <dirent.h> #include <glib/gstdio.h> #include "qapi/error.h" +#include "block/block-io.h" #include "block/block_int.h" #include "block/qdict.h" #include "qemu/module.h"
block/win32-aio.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "qemu/timer.h" +#include "block/block-io.h" #include "block/block_int.h" #include "block/aio.h" #include "block/raw-aio.h"
block/write-threshold.c +1 -0
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "block/block-io.h" #include "block/block_int.h" #include "block/write-threshold.h" #include "qapi/error.h"
blockdev.c +1 -0
@@ -35,6 +35,7 @@#include "sysemu/blockdev.h" #include "hw/block/block.h" #include "block/blockjob.h" +#include "block/dirty-bitmap.h" #include "block/qdict.h" #include "block/throttle-groups.h" #include "monitor/monitor.h"
blockjob.c +1 -0
@@ -24,6 +24,7 @@*/ #include "qemu/osdep.h" +#include "block/aio-wait.h" #include "block/block.h" #include "block/blockjob_int.h" #include "block/block_int.h"
hw/block/block.c +1 -0
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "block/block_int-common.h" #include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "hw/block/block.h"
hw/sparc64/niagara.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "block/block_int-common.h" #include "qemu/units.h" #include "cpu.h" #include "hw/boards.h"
hw/virtio/virtio-pmem.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/iov.h" #include "qemu/main-loop.h" #include "hw/virtio/virtio-pmem.h" #include "hw/qdev-properties.h"
migration/block-dirty-bitmap.c +1 -0
@@ -61,6 +61,7 @@#include "qemu/osdep.h" #include "block/block.h" #include "block/block_int.h" +#include "block/dirty-bitmap.h" #include "sysemu/block-backend.h" #include "sysemu/runstate.h" #include "qemu/main-loop.h"
migration/block.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/cutils.h" #include "qemu/queue.h" #include "block.h" +#include "block/dirty-bitmap.h" #include "migration/misc.h" #include "migration.h" #include "migration/register.h"
migration/savevm.c +1 -0
@@ -52,6 +52,7 @@#include "exec/target_page.h" #include "trace.h" #include "qemu/iov.h" +#include "qemu/job.h" #include "qemu/main-loop.h" #include "block/snapshot.h" #include "qemu/cutils.h"
monitor/qmp-cmds.c +1 -0
@@ -14,6 +14,7 @@*/ #include "qemu/osdep.h" +#include "block/blockjob.h" #include "qemu/cutils.h" #include "qemu/option.h" #include "monitor/monitor.h"
nbd/server.c +2 -0
@@ -19,7 +19,9 @@#include "qemu/osdep.h" +#include "block/block_int.h" #include "block/export.h" +#include "block/dirty-bitmap.h" #include "qapi/error.h" #include "qemu/queue.h" #include "trace.h"
qemu-img.c +1 -0
@@ -48,6 +48,7 @@#include "sysemu/block-backend.h" #include "block/block_int.h" #include "block/blockjob.h" +#include "block/dirty-bitmap.h" #include "block/qapi.h" #include "crypto/init.h" #include "trace/control.h"
softmmu/cpus.c +1 -0
@@ -34,6 +34,7 @@#include "sysemu/hw_accel.h" #include "exec/cpu-common.h" #include "qemu/thread.h" +#include "qemu/main-loop.h" #include "qemu/plugin.h" #include "sysemu/cpus.h" #include "qemu/guest-random.h"
softmmu/physmem.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/cutils.h" #include "qemu/cacheflush.h" +#include "qemu/hbitmap.h" #include "qemu/madvise.h" #ifdef CONFIG_TCG
storage-daemon/qemu-storage-daemon.c +1 -0
@@ -48,6 +48,7 @@#include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/help_option.h" +#include "qemu/job.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h"
target/i386/kvm/kvm.c +1 -0
@@ -37,6 +37,7 @@#include "exec/gdbstub.h" #include "qemu/host-utils.h" #include "qemu/main-loop.h" +#include "qemu/ratelimit.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/memalign.h"
tests/unit/test-bdrv-drain.c +1 -1
@@ -23,7 +23,7 @@*/ #include "qemu/osdep.h" -#include "block/block.h" +#include "block/block_int.h" #include "block/blockjob_int.h" #include "sysemu/block-backend.h" #include "qapi/error.h"
tests/unit/test-block-iothread.c +1 -0
@@ -24,6 +24,7 @@#include "qemu/osdep.h" #include "block/block.h" +#include "block/block_int-global-state.h" #include "block/blockjob_int.h" #include "sysemu/block-backend.h" #include "qapi/error.h"
scripts/block-coroutine-wrapper.py +2 -1
@@ -42,7 +42,8 @@ def gen_header(): #include "qemu/osdep.h" #include "block/coroutines.h" #include "block/block-gen.h" -#include "block/block_int.h"\ +#include "block/block_int.h" +#include "block/dirty-bitmap.h" """
Signature · 1 line
2.38.1
PATCH v2 2/3 hw/sparc64/niagara: Use blk_name() instead of open-coding it
In reply to Markus Armbruster--- hw/sparc64/niagara.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
hw/sparc64/niagara.c +2 -4
@@ -23,7 +23,6 @@*/ #include "qemu/osdep.h" -#include "block/block_int-common.h" #include "qemu/units.h" #include "cpu.h" #include "hw/boards.h"
@@ -144,10 +143,9 @@ static void niagara_init(MachineState *machine)memory_region_add_subregion (get_system_memory (),NIAGARA_VDISK_BASE , &s->vdisk_ram); dinfo->is_default =1 ; -rom_add_file_fixed (blk_bs (blk)->filename,NIAGARA_VDISK_BASE ,-1 ); +rom_add_file_fixed (blk_name (blk),NIAGARA_VDISK_BASE ,-1 ); }else { -error_report ("could not load ram disk '%s'" , -blk_bs (blk)->filename); +error_report ("could not load ram disk '%s'" ,blk_name (blk));exit (1 ); } }
Signature · 1 line
2.38.1
PATCH v2 3/3 include/hw/block: Include hw/block/block.h where needed
In reply to Markus Armbrusterhw/block/swim.h needs BlockConf.
--- include/hw/block/swim.h | 1 + 1 file changed, 1 insertion(+)
include/hw/block/swim.h +1 -0
@@ -11,6 +11,7 @@#ifndef SWIM_H #define SWIM_H +#include "hw/block/block.h" #include "hw/sysbus.h" #include "qom/object.h"
Signature · 1 line
2.38.1