diff options
386 files changed, 527 insertions, 435 deletions
diff --git a/accel/accel.c b/accel/accel.c index 8ae40e1..93e2434 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "sysemu/accel.h" #include "hw/boards.h" -#include "qemu-common.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" @@ -34,6 +33,7 @@ #include "hw/xen/xen.h" #include "qom/object.h" #include "qemu/error-report.h" +#include "qemu/option.h" static const TypeInfo accel_type = { .name = TYPE_ACCEL, diff --git a/audio/wavcapture.c b/audio/wavcapture.c index 5863803..cf31ed6 100644 --- a/audio/wavcapture.c +++ b/audio/wavcapture.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "audio.h" diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 67edfa5..d0dff1a 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -26,7 +26,6 @@ #include "hw/boards.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qemu/config-file.h" #include "qom/object_interfaces.h" diff --git a/backends/hostmem.c b/backends/hostmem.c index ee2c2d5..81d1455 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -14,7 +14,6 @@ #include "hw/boards.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qemu/config-file.h" #include "qom/object_interfaces.h" diff --git a/backends/tpm.c b/backends/tpm.c index d617ba7..a00438b 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" #include "sysemu/tpm_backend.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "sysemu/tpm.h" #include "qemu/thread.h" #include "qemu/main-loop.h" @@ -31,8 +31,8 @@ #include "sysemu/balloon.h" #include "trace-root.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" static QEMUBalloonEvent *balloon_event_fn; static QEMUBalloonStatus *balloon_stat_fn; @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "block/trace.h" #include "block/block_int.h" @@ -29,15 +30,17 @@ #include "qemu/error-report.h" #include "module_block.h" #include "qemu/module.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "qemu/notify.h" +#include "qemu/option.h" #include "qemu/coroutine.h" #include "block/qapi.h" -#include "qmp-commands.h" #include "qemu/timer.h" #include "qapi-event.h" #include "qemu/cutils.h" diff --git a/block/blkdebug.c b/block/blkdebug.c index e216699..d83f23f 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -29,7 +29,7 @@ #include "qemu/config-file.h" #include "block/block_int.h" #include "qemu/module.h" -#include "qapi/qmp/qbool.h" +#include "qemu/option.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "sysemu/qtest.h" diff --git a/block/blkverify.c b/block/blkverify.c index 06369f9..331365b 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -14,6 +14,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" +#include "qemu/option.h" typedef struct { BdrvChild *test_file; diff --git a/block/block-backend.c b/block/block-backend.c index f66349c..0266ac9 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -18,7 +18,9 @@ #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qemu/id.h" +#include "qemu/option.h" #include "trace.h" #include "migration/misc.h" diff --git a/block/crypto.c b/block/crypto.c index 60ddf86..70e3691 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -24,9 +24,11 @@ #include "sysemu/block-backend.h" #include "crypto/block.h" #include "qapi/opts-visitor.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" #include "qapi/error.h" +#include "qemu/option.h" #include "block/crypto.h" typedef struct BlockCrypto BlockCrypto; diff --git a/block/curl.c b/block/curl.c index cd578d3..aa42535 100644 --- a/block/curl.c +++ b/block/curl.c @@ -21,12 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "block/block_int.h" -#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/secret.h" #include <curl/curl.h> diff --git a/block/file-posix.c b/block/file-posix.c index 36ee89e..dd8d7cb 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -21,16 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "trace.h" #include "block/thread-pool.h" #include "qemu/iov.h" #include "block/raw-aio.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "scsi/pr-manager.h" diff --git a/block/file-win32.c b/block/file-win32.c index 9e02214..f24c7bb 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -21,15 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/cutils.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "block/raw-aio.h" #include "trace.h" #include "block/thread-pool.h" #include "qemu/iov.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include <windows.h> #include <winioctl.h> diff --git a/block/gluster.c b/block/gluster.c index 0f4265a..d8decc4 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -7,13 +7,16 @@ * See the COPYING file in the top-level directory. * */ + #include "qemu/osdep.h" #include <glusterfs/api/glfs.h> #include "block/block_int.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qemu/uri.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/cutils.h" #define GLUSTER_OPT_FILENAME "filename" diff --git a/block/iscsi-opts.c b/block/iscsi-opts.c index 5335539..9b19bd2 100644 --- a/block/iscsi-opts.c +++ b/block/iscsi-opts.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/option.h" static QemuOptsList qemu_iscsi_opts = { .name = "iscsi", diff --git a/block/iscsi.c b/block/iscsi.c index 6a1c537..9f99ae5 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -28,7 +28,6 @@ #include <poll.h> #include <math.h> #include <arpa/inet.h> -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/bitops.h" @@ -36,8 +35,11 @@ #include "block/block_int.h" #include "scsi/constants.h" #include "qemu/iov.h" +#include "qemu/option.h" #include "qemu/uuid.h" #include "qmp-commands.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/secret.h" #include "scsi/utils.h" diff --git a/block/nbd.c b/block/nbd.c index 94220f6..411eeb4 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -32,11 +32,11 @@ #include "qemu/uri.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qapi-visit.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" diff --git a/block/nfs.c b/block/nfs.c index effc871..6576a73 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -25,13 +25,13 @@ #include "qemu/osdep.h" #include <poll.h> -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "block/block_int.h" #include "trace.h" #include "qemu/iov.h" +#include "qemu/option.h" #include "qemu/uri.h" #include "qemu/cutils.h" #include "sysemu/sysemu.h" diff --git a/block/null.c b/block/null.c index 0cdabaa..214d394 100644 --- a/block/null.c +++ b/block/null.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" +#include "qemu/option.h" #include "block/block_int.h" #define NULL_OPT_LATENCY "latency-ns" diff --git a/block/nvme.c b/block/nvme.c index e9d0e21..10bffbb 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -18,6 +18,7 @@ #include "qapi/qmp/qstring.h" #include "qemu/error-report.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "qemu/vfio-helpers.h" #include "block/block_int.h" #include "trace.h" diff --git a/block/parallels.c b/block/parallels.c index d380208..e1e3d80 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -27,12 +27,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "qemu/bitmap.h" #include "migration/blocker.h" diff --git a/block/parallels.h b/block/parallels.h index 4b04407..5aa101c 100644 --- a/block/parallels.h +++ b/block/parallels.h @@ -32,7 +32,6 @@ #ifndef BLOCK_PARALLELS_H #define BLOCK_PARALLELS_H #include "qemu/coroutine.h" -#include "qemu/typedefs.h" #define HEADS_NUMBER 16 #define SEC_IN_CYL 32 diff --git a/block/qapi.c b/block/qapi.c index fc10f0a..1fdeb1e 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -29,8 +29,13 @@ #include "block/write-threshold.h" #include "qmp-commands.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" #include "qemu/cutils.h" diff --git a/block/qcow.c b/block/qcow.c index d552a6e..8631155 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -21,16 +21,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include <zlib.h> -#include "qapi/qmp/qerror.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/block.h" #include "migration/blocker.h" diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index a3fec27..3a979bc 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include <zlib.h> -#include "qapi/error.h" #include "qemu-common.h" #include "block/block_int.h" #include "block/qcow2.h" diff --git a/block/qcow2.c b/block/qcow2.c index 1f80961..a64a572 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "block/block_int.h" #include "sysemu/block-backend.h" @@ -28,9 +29,10 @@ #include <zlib.h> #include "block/qcow2.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "qapi-event.h" #include "trace.h" #include "qemu/option_int.h" diff --git a/block/qed.c b/block/qed.c index 821dcaa..205dbf1 100644 --- a/block/qed.c +++ b/block/qed.c @@ -16,9 +16,9 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bswap.h" +#include "qemu/option.h" #include "trace.h" #include "qed.h" -#include "qapi/qmp/qerror.h" #include "sysemu/block-backend.h" static int bdrv_qed_probe(const uint8_t *buf, int buf_size, diff --git a/block/quorum.c b/block/quorum.c index 272f9a5..19f1c34 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -15,11 +15,11 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "block/block_int.h" -#include "qapi/qmp/qbool.h" +#include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qapi-event.h" diff --git a/block/rbd.c b/block/rbd.c index a76a5e8..8474b0b 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -16,11 +16,14 @@ #include <rbd/librbd.h> #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "block/block_int.h" #include "crypto/secret.h" #include "qemu/cutils.h" #include "qapi/qmp/qstring.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qlist.h" /* * When specifying the image filename use: diff --git a/block/replication.c b/block/replication.c index b1ea3ca..f98ef09 100644 --- a/block/replication.c +++ b/block/replication.c @@ -13,7 +13,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "block/nbd.h" #include "block/blockjob.h" #include "block/block_int.h" diff --git a/block/sheepdog.c b/block/sheepdog.c index f684477..af125a2 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -19,6 +19,7 @@ #include "qapi/qobject-input-visitor.h" #include "qemu/uri.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "block/block_int.h" #include "sysemu/block-backend.h" diff --git a/block/snapshot.c b/block/snapshot.c index 8cb70db..eacc1f1 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -26,8 +26,10 @@ #include "block/snapshot.h" #include "block/block_int.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qstring.h" +#include "qemu/option.h" QemuOptsList internal_snapshot_opts = { .name = "snapshot", diff --git a/block/ssh.c b/block/ssh.c index 8890a0c..b63addc 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -30,10 +30,12 @@ #include "block/block_int.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/cutils.h" #include "qemu/sockets.h" #include "qemu/uri.h" #include "qapi-visit.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" diff --git a/block/throttle.c b/block/throttle.c index 833175a..495f88c 100644 --- a/block/throttle.c +++ b/block/throttle.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "block/throttle-groups.h" +#include "qemu/option.h" #include "qemu/throttle-options.h" #include "qapi/error.h" diff --git a/block/vdi.c b/block/vdi.c index 8da5dfc..fc1c614 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -54,6 +54,7 @@ #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" #include "qemu/coroutine.h" diff --git a/block/vhdx.c b/block/vhdx.c index 9956933..c449c5d 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -17,10 +17,10 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/crc32c.h" #include "qemu/bswap.h" #include "block/vhdx.h" diff --git a/block/vmdk.c b/block/vmdk.c index d71cec4..ef15ddb 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -30,6 +30,7 @@ #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" #include "qemu/cutils.h" diff --git a/block/vpc.c b/block/vpc.c index 1576d7b..cfa5144 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -22,12 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "migration/blocker.h" #include "qemu/bswap.h" #include "qemu/uuid.h" diff --git a/block/vvfat.c b/block/vvfat.c index a690595..7e06eba 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -22,14 +22,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include <dirent.h> #include "qapi/error.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" -#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/error-report.h" diff --git a/block/write-threshold.c b/block/write-threshold.c index 0bd1a01..db3de0f 100644 --- a/block/write-threshold.c +++ b/block/write-threshold.c @@ -16,9 +16,9 @@ #include "block/write-threshold.h" #include "qemu/notify.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qmp-commands.h" - uint64_t bdrv_write_threshold_get(const BlockDriverState *bs) { return bs->write_threshold_offset; diff --git a/blockdev-nbd.c b/blockdev-nbd.c index a9f79c6..3a5479b 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -13,7 +13,7 @@ #include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "hw/block/block.h" -#include "qapi/qmp/qerror.h" +#include "qapi/error.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" #include "block/nbd.h" @@ -40,9 +40,13 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qlist.h" #include "qapi/qobject-output-visitor.h" #include "sysemu/sysemu.h" #include "sysemu/iothread.h" @@ -29,11 +29,10 @@ #include "block/blockjob_int.h" #include "block/block_int.h" #include "sysemu/block-backend.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" #include "qemu/coroutine.h" #include "qemu/id.h" -#include "qmp-commands.h" #include "qemu/timer.h" #include "qapi-event.h" diff --git a/chardev/char-file.c b/chardev/char-file.c index a57b88a..87fb610 100644 --- a/chardev/char-file.c +++ b/chardev/char-file.c @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "chardev/char.h" #ifdef _WIN32 diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 567bf96..d48e781 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "chardev/char.h" #include "sysemu/block-backend.h" #include "chardev/char-mux.h" diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c index bce89f8..ab82c72 100644 --- a/chardev/char-parallel.c +++ b/chardev/char-parallel.c @@ -21,9 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "chardev/char.h" #include "qapi/error.h" +#include "qemu/option.h" #include <sys/ioctl.h> #ifdef CONFIG_BSD diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c index 3a95e4c..8a51872 100644 --- a/chardev/char-pipe.c +++ b/chardev/char-pipe.c @@ -21,8 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/option.h" #include "chardev/char.h" #ifdef _WIN32 diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c index df52b04..679afaa 100644 --- a/chardev/char-ringbuf.c +++ b/chardev/char-ringbuf.c @@ -21,10 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "chardev/char.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qemu/base64.h" +#include "qemu/option.h" /* Ring buffer chardev */ diff --git a/chardev/char-serial.c b/chardev/char-serial.c index 93392c5..feb52e5 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -21,7 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "io/channel-file.h" #include "qapi/error.h" diff --git a/chardev/char-socket.c b/chardev/char-socket.c index a340af6..bdd6cff 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -21,12 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "chardev/char.h" #include "io/channel-socket.h" #include "io/channel-tls.h" #include "io/net-listener.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qapi/error.h" #include "qapi/clone-visitor.h" diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c index 6f5d798..96375f2 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "qapi/error.h" -#include "qemu-common.h" #include "chardev/char.h" #ifdef _WIN32 diff --git a/chardev/char-udp.c b/chardev/char-udp.c index d46ff7a..097a2f0 100644 --- a/chardev/char-udp.c +++ b/chardev/char-udp.c @@ -21,10 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "chardev/char.h" #include "io/channel-socket.h" #include "qapi/error.h" +#include "qemu/option.h" #include "chardev/char-io.h" diff --git a/chardev/char.c b/chardev/char.c index 3e14de1..01d979a 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qemu/cutils.h" #include "monitor/monitor.h" @@ -30,8 +31,10 @@ #include "chardev/char.h" #include "qmp-commands.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "sysemu/replay.h" #include "qemu/help_option.h" +#include "qemu/option.h" #include "chardev/char-mux.h" diff --git a/chardev/spice.c b/chardev/spice.c index a312078..e66e3ad 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -2,7 +2,9 @@ #include "trace.h" #include "ui/qemu-spice.h" #include "chardev/char.h" +#include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include <spice.h> #include <spice/protocol.h> diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c index 45776d8..197c79c 100644 --- a/contrib/ivshmem-server/main.c +++ b/contrib/ivshmem-server/main.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/cutils.h" - +#include "qemu/option.h" #include "ivshmem-server.h" #define IVSHMEM_SERVER_DEFAULT_VERBOSE 0 diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c index 54c1191..02c2901 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -11,10 +11,10 @@ */ #include "qemu/osdep.h" +#include <iscsi/iscsi.h> +#include <iscsi/scsi-lowlevel.h> #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_scsi.h" -#include "iscsi/iscsi.h" -#include "iscsi/scsi-lowlevel.h" #include <glib.h> @@ -22,12 +22,11 @@ * THE SOFTWARE. */ -/* Needed early for CONFIG_BSD etc. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/config-file.h" #include "cpu.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "sysemu/sysemu.h" @@ -46,6 +45,7 @@ #include "sysemu/cpus.h" #include "sysemu/qtest.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qemu/bitmap.h" #include "qemu/seqlock.h" #include "tcg.h" diff --git a/crypto/hash.c b/crypto/hash.c index 8dab25d..b97323c 100644 --- a/crypto/hash.c +++ b/crypto/hash.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "crypto/hash.h" #include "hashpriv.h" diff --git a/crypto/hmac.c b/crypto/hmac.c index f6c2d8d..4de7e8c 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "crypto/hmac.h" #include "hmacpriv.h" diff --git a/crypto/ivgen-essiv.c b/crypto/ivgen-essiv.c index ad4d926..aeaa8fc 100644 --- a/crypto/ivgen-essiv.c +++ b/crypto/ivgen-essiv.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/bswap.h" #include "crypto/ivgen-essiv.h" diff --git a/crypto/ivgen-plain.c b/crypto/ivgen-plain.c index 9b9b4ad..bf2fb7a 100644 --- a/crypto/ivgen-plain.c +++ b/crypto/ivgen-plain.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/bswap.h" #include "crypto/ivgen-plain.h" diff --git a/crypto/ivgen-plain64.c b/crypto/ivgen-plain64.c index 6c6b1b4..e4679a1 100644 --- a/crypto/ivgen-plain64.c +++ b/crypto/ivgen-plain64.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/bswap.h" #include "crypto/ivgen-plain.h" diff --git a/crypto/random-gnutls.c b/crypto/random-gnutls.c index 5350003..445fd6a 100644 --- a/crypto/random-gnutls.c +++ b/crypto/random-gnutls.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "crypto/random.h" +#include "qapi/error.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h> diff --git a/crypto/random-platform.c b/crypto/random-platform.c index 92eed0e..7541b4c 100644 --- a/crypto/random-platform.c +++ b/crypto/random-platform.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "crypto/random.h" +#include "qapi/error.h" #ifdef _WIN32 #include <wincrypt.h> diff --git a/device-hotplug.c b/device-hotplug.c index 126f73c..23fd665 100644 --- a/device-hotplug.c +++ b/device-hotplug.c @@ -27,7 +27,9 @@ #include "hw/boards.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" +#include "qapi/qmp/qdict.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "block/block_int.h" diff --git a/device_tree.c b/device_tree.c index a24ddff..19458b3 100644 --- a/device_tree.c +++ b/device_tree.c @@ -18,8 +18,8 @@ #endif #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index 06ab699..5900b39 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -1170,7 +1170,6 @@ Example: #include "example-qapi-types.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" - #include "qapi/error.h" void example_qmp_init_marshal(QmpCommandList *cmds); UserDefOne *qmp_my_command(UserDefOneList *arg1, Error **errp); @@ -1263,7 +1262,6 @@ Example: #ifndef EXAMPLE_QAPI_EVENT_H #define EXAMPLE_QAPI_EVENT_H - #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "example-qapi-types.h" @@ -22,6 +22,7 @@ #include "sysemu/sysemu.h" #include "sysemu/memory_mapping.h" #include "sysemu/cpus.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qmp-commands.h" #include "qapi-event.h" diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c index 1dc07fb..cfd8641 100644 --- a/fsdev/qemu-fsdev-throttle.c +++ b/fsdev/qemu-fsdev-throttle.c @@ -16,6 +16,7 @@ #include "qemu/error-report.h" #include "qemu-fsdev-throttle.h" #include "qemu/iov.h" +#include "qemu/option.h" static void fsdev_throttle_read_timer_cb(void *opaque) { diff --git a/fsdev/qemu-fsdev-throttle.h b/fsdev/qemu-fsdev-throttle.h index e418643..4e83bda 100644 --- a/fsdev/qemu-fsdev-throttle.h +++ b/fsdev/qemu-fsdev-throttle.h @@ -18,7 +18,6 @@ #include "block/aio.h" #include "qemu/main-loop.h" #include "qemu/coroutine.h" -#include "qapi/error.h" #include "qemu/throttle.h" typedef struct FsThrottle { diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index 941e309..8a4afbf 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -8,14 +8,15 @@ * * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. - * */ + #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu-fsdev.h" #include "qemu/queue.h" -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" static QTAILQ_HEAD(FsDriverEntry_head, FsDriverListEntry) fsdriver_entries = QTAILQ_HEAD_INITIALIZER(fsdriver_entries); diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h index 29c9622..65e4b1c 100644 --- a/fsdev/qemu-fsdev.h +++ b/fsdev/qemu-fsdev.h @@ -12,7 +12,6 @@ */ #ifndef QEMU_FSDEV_H #define QEMU_FSDEV_H -#include "qemu/option.h" #include "file-op-9p.h" @@ -27,7 +27,9 @@ #include "qemu/sockets.h" #include "monitor/monitor.h" #include "monitor/qdev.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" @@ -16,8 +16,6 @@ #include "qemu-common.h" #include "qemu/readline.h" -#include "qapi-types.h" -#include "qapi/qmp/qdict.h" void hmp_info_name(Monitor *mon, const QDict *qdict); void hmp_info_version(Monitor *mon, const QDict *qdict); diff --git a/hw/9pfs/9p-handle.c b/hw/9pfs/9p-handle.c index c1681d3..4dc0d2b 100644 --- a/hw/9pfs/9p-handle.c +++ b/hw/9pfs/9p-handle.c @@ -22,6 +22,7 @@ #include "qemu/xattr.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include <linux/fs.h> #ifdef CONFIG_LINUX_MAGIC_H #include <linux/magic.h> diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index b25c185..b37b1db 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -8,7 +8,6 @@ * * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. - * */ #include "qemu/osdep.h" @@ -23,8 +22,10 @@ #include <sys/socket.h> #include <sys/un.h> #include "qemu/xattr.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include <libgen.h> #include <linux/fs.h> #ifdef CONFIG_LINUX_MAGIC_H diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index f030c6a..e2e0329 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -9,12 +9,15 @@ * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include <sys/socket.h> #include <sys/un.h> #include "9p.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "fsdev/qemu-fsdev.h" #include "9p-proxy.h" diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index 14f0d6a..95e50c4 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -15,6 +15,7 @@ #include "hw/xen/xen_backend.h" #include "hw/9pfs/xen-9pfs.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "fsdev/qemu-fsdev.h" #define VERSIONS "1" diff --git a/hw/acpi/acpi-stub.c b/hw/acpi/acpi-stub.c index 26bd22f..4c9d081 100644 --- a/hw/acpi/acpi-stub.c +++ b/hw/acpi/acpi-stub.c @@ -19,8 +19,8 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qmp-commands.h" #include "hw/acpi/acpi.h" void acpi_table_add(const QemuOpts *opts, Error **errp) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index eb9b76f..b50b3ca 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -18,16 +18,19 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ + #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/hw.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "qemu/config-file.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "qapi-visit.h" #include "qapi-event.h" #include "qemu/error-report.h" +#include "qemu/option.h" struct acpi_table_header { uint16_t _length; /* our length, not actual part of the hdr */ diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index cda2c9d..ea958a0 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -6,6 +6,7 @@ #include "hw/qdev-core.h" #include "trace.h" #include "qapi-event.h" +#include "qapi/error.h" #define MEMORY_SLOTS_NUMBER "MDNR" #define MEMORY_HOTPLUG_IO_REGION "HPMR" diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index ba6f47b..f25eafc 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qmp-commands.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c index 13f31ad..329a8aa 100644 --- a/hw/adc/stm32f2xx_adc.c +++ b/hw/adc/stm32f2xx_adc.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/hw.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/adc/stm32f2xx_adc.h" diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 9b174b9..05108bc 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -22,6 +22,7 @@ #include "elf.h" #include "sysemu/device_tree.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "exec/address-spaces.h" /* Kernel boot protocol is specified in the kernel docs diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index b53b4c9..f840f07 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/cutils.h" #include "qom/object.h" #include "hw/qdev-core.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 56fa402..faae083 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -11,7 +11,6 @@ #include "hw/m68k/mcf.h" #include "chardev/char-fe.h" #include "exec/address-spaces.h" -#include "qapi/error.h" typedef struct { SysBusDevice parent_obj; diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 172c72d..4be5d4e 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -16,6 +16,7 @@ #include "trace.h" #include "hw/virtio/virtio-serial.h" #include "qapi-event.h" +#include "qapi/error.h" #define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport" #define VIRTIO_CONSOLE(obj) \ diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 11f8a27..7ed1f43 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -28,10 +28,11 @@ #include "qemu/osdep.h" #include "hw/qdev.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" -#include "qapi/qmp/qjson.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/hotplug.h" #include "hw/boards.h" #include "hw/sysbus.h" diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index 59120dd..3ce44fd 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -28,6 +28,7 @@ #include "hw/hw.h" #include "hw/sysbus.h" #include "trace.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/hw/display/qxl.c b/hw/display/qxl.c index b9fa067..a71714c 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include <zlib.h> +#include "qapi/error.h" #include "qemu-common.h" #include "qemu/timer.h" #include "qemu/queue.h" diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index 8c106a6..7db84ef 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -17,7 +17,6 @@ #include "trace.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" -#include "qapi/error.h" #ifdef CONFIG_VIRGL diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c index 3519dc8..cece4aa 100644 --- a/hw/display/virtio-gpu-pci.c +++ b/hw/display/virtio-gpu-pci.c @@ -10,7 +10,9 @@ * See the COPYING file in the top-level directory. * */ + #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/pci/pci.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index ead4e1a..6715b9c 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu/log.h" #include "hw/display/xlnx_dp.h" diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index e873a44..ab64d19 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "qemu/log.h" #include "cpu.h" diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index ed78c4e..deb440f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qnum.h" #include "acpi-build.h" #include "qemu-common.h" #include "qemu/bitmap.h" diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index c7b70c9..46d9c68 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "cpu.h" #include "hw/hw.h" #include "hw/nvram/fw_cfg.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ccc50ba..55e69d6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" @@ -58,12 +59,14 @@ #include "qemu/bitmap.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/boards.h" #include "hw/pci/pci_host.h" #include "acpi-build.h" #include "hw/mem/pc-dimm.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi-visit.h" #include "qom/cpu.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a25619d..456dc9e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -47,6 +47,7 @@ #include "exec/address-spaces.h" #include "hw/acpi/acpi.h" #include "cpu.h" +#include "qapi/error.h" #include "qemu/error-report.h" #ifdef CONFIG_XEN #include <xen/hvm/hvm_info_table.h> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index ed3a0b8..aba7541 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -27,6 +27,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/loader.h" @@ -48,6 +49,7 @@ #include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/usb.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/numa.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 6b18374..4325575 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -27,6 +27,7 @@ #include "qapi/error.h" #include "sysemu/block-backend.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/i386/pc.h" diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 8028bed..bfdbe55 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -17,7 +17,7 @@ #include "hw/xen/xen_common.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" - +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/range.h" #include "sysemu/xen-mapcache.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 5be72d4..257b429 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -22,6 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" @@ -33,6 +34,7 @@ #include "sysemu/dma.h" #include "hw/block/block.h" #include "sysemu/block-backend.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "hw/ide/internal.h" diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 17aa930..e3896c6 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -12,8 +12,8 @@ * http://wiki.osdev.org/User:Quok/Silicon_Image_Datasheets */ -#include <qemu/osdep.h> -#include <hw/ide/pci.h> +#include "qemu/osdep.h" +#include "hw/ide/pci.h" #include "trace.h" #define TYPE_SII3112_PCI "sii3112" diff --git a/hw/intc/xics_pnv.c b/hw/intc/xics_pnv.c index 2a955a8..c87de21 100644 --- a/hw/intc/xics_pnv.c +++ b/hw/intc/xics_pnv.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/ppc/xics.h" diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 5a0967c..2e27b92 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -34,7 +34,6 @@ #include "hw/ppc/xics.h" #include "hw/ppc/fdt.h" #include "qapi/visitor.h" -#include "qapi/error.h" /* * Guest interfaces diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index b27babd..adbbf6e 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -28,6 +28,7 @@ #include "sysemu/sysemu.h" #include "qmp-commands.h" #include "qom/object_interfaces.h" +#include "qapi/error.h" #include "qapi/visitor.h" static uint32_t ipmi_current_uuid = 1; diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 596f3c2..b09871a 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -45,6 +45,7 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/help_option.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 7ca8ba2..6f0deb9 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -51,6 +51,7 @@ #include "hw/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" #include "sysemu/qtest.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "hw/empty_slot.h" #include "sysemu/kvm.h" diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c index 31ebe38..4ecbebd 100644 --- a/hw/misc/exynos4210_rng.c +++ b/hw/misc/exynos4210_rng.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "crypto/random.h" #include "hw/sysbus.h" +#include "qapi/error.h" #include "qemu/log.h" #define DEBUG_EXYNOS_RNG 0 diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 211f609..d019d41 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/hw.h" #include "hw/sysbus.h" diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index 32be2a9..6a9d251 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/qmp-norocker.c index 6acbcdb..94c1e48 100644 --- a/hw/net/rocker/qmp-norocker.c +++ b/hw/net/rocker/qmp-norocker.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" RockerSwitch *qmp_query_rocker(const char *name, Error **errp) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 823a29d..a2a76c2 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -21,6 +21,7 @@ #include "hw/pci/msix.h" #include "net/net.h" #include "net/eth.h" +#include "qapi/error.h" #include "qemu/iov.h" #include "qemu/bitops.h" #include "qmp-commands.h" diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c index 191a58e..9339df2 100644 --- a/hw/net/rocker/rocker_of_dpa.c +++ b/hw/net/rocker/rocker_of_dpa.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "net/eth.h" +#include "qapi/error.h" #include "qemu/iov.h" #include "qemu/timer.h" #include "qmp-commands.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 38674b0..369d40b 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -22,7 +22,7 @@ #include "hw/virtio/virtio-net.h" #include "net/vhost_net.h" #include "hw/virtio/virtio-bus.h" -#include "qapi/qmp/qjson.h" +#include "qapi/error.h" #include "qapi-event.h" #include "hw/virtio/virtio-access.h" #include "migration/misc.h" diff --git a/hw/nios2/cpu_pic.c b/hw/nios2/cpu_pic.c index 0f95987..6bccce2 100644 --- a/hw/nios2/cpu_pic.c +++ b/hw/nios2/cpu_pic.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index efa3621..22183f5 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -7,9 +7,8 @@ * the LICENSE file in the top-level directory. */ -#include <string.h> - #include "qemu/osdep.h" + #include "qapi/error.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 4313484..2a0739d 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "sysemu/sysemu.h" @@ -31,6 +32,7 @@ #include "hw/sysbus.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/cutils.h" #include "qapi/error.h" diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c index cb522bf..f557b12 100644 --- a/hw/pci-bridge/i82801b11.c +++ b/hw/pci-bridge/i82801b11.c @@ -44,8 +44,6 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" #include "hw/i386/ich9.h" -#include "qapi/error.h" - /*****************************************************************************/ /* ICH9 DMI-to-PCI bridge */ diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c index 5f56a2f..79fa84d 100644 --- a/hw/pci-bridge/ioh3420.c +++ b/hw/pci-bridge/ioh3420.c @@ -25,7 +25,6 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "ioh3420.h" -#include "qapi/error.h" #define PCI_DEVICE_ID_IOH_EPORT 0x3420 /* D0:F0 express mode */ #define PCI_DEVICE_ID_IOH_REV 0x2 diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c index 227997c..df56925 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -24,7 +24,6 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "xio3130_upstream.h" -#include "qapi/error.h" #define PCI_DEVICE_ID_TI_XIO3130U 0x8232 /* upstream port */ #define XIO3130_REVISION 0x2 diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index 2268a41..e2f4ee4 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -34,7 +34,6 @@ #include "hw/pci-host/sabre.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" -#include "qapi/error.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c index d5ce007..74ce731 100644 --- a/hw/pci/pci-stub.c +++ b/hw/pci/pci-stub.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "hw/pci/pci.h" #include "qmp-commands.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index fc25cde..239f73d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" @@ -40,6 +41,7 @@ #include "exec/address-spaces.h" #include "hw/hotplug.h" #include "hw/boards.h" +#include "qapi/error.h" #include "qemu/cutils.h" //#define DEBUG_PCI diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index b009be7..939da0b 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -20,8 +20,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "qapi/qmp/types.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qdict.h" #include "monitor/monitor.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 343bba9..a40d3ec 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -16,7 +16,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "e500.h" #include "e500-ccsr.h" #include "net/net.h" @@ -36,6 +35,7 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "qemu/host-utils.h" +#include "qemu/option.h" #include "hw/pci-host/ppce500.h" #include "qemu/error-report.h" #include "hw/platform-bus.h" diff --git a/hw/ppc/fdt.c b/hw/ppc/fdt.c index 38a7234..2ffc586 100644 --- a/hw/ppc/fdt.c +++ b/hw/ppc/fdt.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "target/ppc/cpu.h" #include "hw/ppc/fdt.h" diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c index b2cf441..4b76d34 100644 --- a/hw/ppc/pnv_bmc.c +++ b/hw/ppc/pnv_bmc.c @@ -20,7 +20,6 @@ #include "hw/hw.h" #include "sysemu/sysemu.h" #include "target/ppc/cpu.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/ipmi/ipmi.h" #include "hw/ppc/fdt.h" diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index 99c40ef..46fae41 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -17,7 +17,6 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "hw/hw.h" #include "qemu/log.h" #include "sysemu/hw_accel.h" diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 7ec35de..ec4be25 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -33,7 +33,6 @@ #include "hw/timer/m48t59.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "qapi/error.h" #include "hw/loader.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 32a876b..659be6b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -74,7 +74,6 @@ #include "hw/compat.h" #include "qemu/cutils.h" #include "hw/ppc/spapr_cpu_core.h" -#include "qmp-commands.h" #include <libfdt.h> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index e3b1229..aa25113 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qnull.h" #include "cpu.h" #include "qemu/cutils.h" #include "hw/ppc/spapr_drc.h" diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index 053efb0..71491db 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include <linux/vfio.h> -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" #include "hw/ppc/spapr.h" diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 9ec3078..cfdb274 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -23,14 +23,15 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. - * */ + #include "qemu/osdep.h" #include "cpu.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/ppc/spapr.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qemu/cutils.h" void spapr_rtc_read(sPAPRRTCState *rtc, struct tm *tm, uint32_t *ns) diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 485d9af..77a1778 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -37,6 +37,7 @@ #include "elf.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/option.h" #include "exec/address-spaces.h" #include "hw/ppc/ppc.h" diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c index 4a9d4d2..7fc1c60 100644 --- a/hw/s390x/s390-ccw.c +++ b/hw/s390x/s390-ccw.c @@ -10,10 +10,11 @@ * or (at your option) any later version. See the COPYING file in the * top-level directory. */ + #include "qemu/osdep.h" +#include <libgen.h> #include "qapi/error.h" #include "hw/sysbus.h" -#include "libgen.h" #include "hw/s390x/css.h" #include "hw/s390x/css-bridge.h" #include "hw/s390x/s390-ccw.h" diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 53ad5d3..bdb6c18 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -13,6 +13,8 @@ #include "hw/boards.h" #include "qmp-commands.h" #include "hw/s390x/storage-keys.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" #include "migration/register.h" diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 2902f54..a1d2135 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -12,13 +12,13 @@ #include "qemu/osdep.h" #include "hw/boards.h" #include "cpu.h" -#include "qmp-commands.h" #include "migration/qemu-file.h" #include "migration/register.h" #include "hw/s390x/storage-attributes.h" #include "qemu/error-report.h" #include "exec/ram_addr.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #define CMMA_BLOCK_SIZE (1 << 10) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 2af3b3d..4abbe89 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/boards.h" #include "exec/address-spaces.h" @@ -24,6 +23,7 @@ #include "virtio-ccw.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "s390-pci-bus.h" #include "hw/s390x/storage-keys.h" #include "hw/s390x/storage-attributes.h" @@ -33,7 +33,6 @@ #include "hw/s390x/css-bridge.h" #include "migration/register.h" #include "cpu_models.h" -#include "qapi/qmp/qerror.h" #include "hw/nmi.h" S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index ee586e7..45975c2 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -27,7 +27,6 @@ #include "hw/sysbus.h" #include "hw/scsi/esp.h" #include "trace.h" -#include "qapi/error.h" #include "qemu/log.h" /* diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 05e501e..b7bafbe 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -2,6 +2,7 @@ #include "hw/hw.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "hw/qdev.h" diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c index d434b3e..77e9897 100644 --- a/hw/scsi/vhost-scsi-common.c +++ b/hw/scsi/vhost-scsi-common.c @@ -16,7 +16,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/error-report.h" #include "migration/migration.h" #include "hw/virtio/vhost.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b395ac5..ee95e78 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -32,7 +32,6 @@ #include "qemu/bitops.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" -#include "qapi/error.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/smbios/smbios-stub.c b/hw/smbios/smbios-stub.c index 3087394..d3a3854 100644 --- a/hw/smbios/smbios-stub.c +++ b/hw/smbios/smbios-stub.c @@ -21,8 +21,8 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qmp-commands.h" #include "hw/smbios/smbios.h" void smbios_entry_add(QemuOpts *opts, Error **errp) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 5d11f01..27a07e9 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -19,6 +19,7 @@ #include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "sysemu/sysemu.h" #include "qemu/uuid.h" #include "sysemu/cpus.h" diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 996ce2a..1874477 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c index 4cf8e69..eb3aaa8 100644 --- a/hw/sparc64/sun4u_iommu.c +++ b/hw/sparc64/sun4u_iommu.c @@ -28,7 +28,6 @@ #include "hw/sysbus.h" #include "hw/sparc/sun4u_iommu.h" #include "exec/address-spaces.h" -#include "qapi/error.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/ssi/stm32f2xx_spi.c b/hw/ssi/stm32f2xx_spi.c index 69514da..930c616 100644 --- a/hw/ssi/stm32f2xx_spi.c +++ b/hw/ssi/stm32f2xx_spi.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/ssi/stm32f2xx_spi.h" diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 844aad5..742c576 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/timer/m48t59.h" -#include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 35a05a6..9d93a16 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/bcd.h" @@ -29,6 +30,7 @@ #include "sysemu/sysemu.h" #include "sysemu/replay.h" #include "hw/timer/mc146818rtc.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi-event.h" #include "qmp-commands.h" diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 710a9ec..b787aee 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -40,11 +40,6 @@ #include "qapi/clone-visitor.h" #include "chardev/char-fe.h" -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <stdio.h> - #define DEBUG_TPM 0 #define DPRINTF(fmt, ...) do { \ diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h index abbca51..a4c77fb 100644 --- a/hw/tpm/tpm_int.h +++ b/hw/tpm/tpm_int.h @@ -12,8 +12,6 @@ #ifndef TPM_TPM_INT_H #define TPM_TPM_INT_H -#include "qemu/osdep.h" - #define TPM_STANDARD_CMDLINE_OPTS \ { \ .name = "type", \ diff --git a/hw/tpm/tpm_ioctl.h b/hw/tpm/tpm_ioctl.h index 54c8d34..59a0b05 100644 --- a/hw/tpm/tpm_ioctl.h +++ b/hw/tpm/tpm_ioctl.h @@ -8,9 +8,7 @@ #ifndef _TPM_IOCTL_H_ #define _TPM_IOCTL_H_ -#include <stdint.h> #include <sys/uio.h> -#include <sys/types.h> #include <sys/ioctl.h> /* diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 085ed2c..b7dd360 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -9,7 +9,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include <cacard/vscard_common.h> #include "chardev/char-fe.h" #include "qemu/error-report.h" diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 584a6f2..3beeb0d 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -23,13 +23,13 @@ #include <libusb.h> #include <sys/user.h> -#include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "hw/sysbus.h" #include "hw/usb.h" #include "hw/xen/xen_backend.h" #include "monitor/qdev.h" -#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "hw/xen/io/ring.h" diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 879510c..f02b3aa 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -26,6 +26,7 @@ #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/range.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 14e08d2..e05df20 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -23,6 +23,7 @@ #include "hw/virtio/virtio-balloon.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi-event.h" #include "trace.h" diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 670114e..98a5dd6 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -23,7 +23,7 @@ #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/queue.h" -#include "qapi/qmp/types.h" +#include "qapi/error.h" #include "sysemu/sysemu.h" #include "sysemu/watchdog.h" #include "qapi-event.h" diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index afa1e3f..83099dd 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "hw/xen/xen_backend.h" -#include "qmp-commands.h" #include "chardev/char.h" #include "sysemu/accel.h" #include "migration/misc.h" diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c index a80e78c..fac9d3f 100644 --- a/hw/xen/xen_devconfig.c +++ b/hw/xen/xen_devconfig.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "hw/xen/xen_backend.h" +#include "qemu/option.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h index cab4d17..e9aa087 100644 --- a/hw/xtensa/xtensa_memory.h +++ b/hw/xtensa/xtensa_memory.h @@ -28,7 +28,6 @@ #ifndef _XTENSA_MEMORY_H #define _XTENSA_MEMORY_H -#include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" #include "exec/memory.h" diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 76ea970..70686a2 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "sysemu/sysemu.h" #include "hw/boards.h" @@ -43,6 +42,7 @@ #include "chardev/char.h" #include "sysemu/device_tree.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "bootparam.h" #include "xtensa_memory.h" diff --git a/include/block/block.h b/include/block/block.h index 2025d7e..24ef816 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -2,14 +2,12 @@ #define BLOCK_H #include "block/aio.h" +#include "qapi-types.h" #include "qemu/iov.h" -#include "qemu/option.h" #include "qemu/coroutine.h" #include "block/accounting.h" #include "block/dirty-bitmap.h" #include "block/blockjob.h" -#include "qapi/qmp/qobject.h" -#include "qapi-types.h" #include "qemu/hbitmap.h" /* block.c */ diff --git a/include/block/block_int.h b/include/block/block_int.h index 99b9190..5ea63f8 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -26,12 +26,10 @@ #include "block/accounting.h" #include "block/block.h" -#include "qemu/option.h" #include "qemu/queue.h" #include "qemu/coroutine.h" #include "qemu/stats64.h" #include "qemu/timer.h" -#include "qapi-types.h" #include "qemu/hbitmap.h" #include "block/snapshot.h" #include "qemu/main-loop.h" diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index a591c27..3da8486 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -2,6 +2,7 @@ #define BLOCK_DIRTY_BITMAP_H #include "qemu-common.h" +#include "qapi-types.h" #include "qemu/hbitmap.h" BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, diff --git a/include/block/nbd.h b/include/block/nbd.h index ee74ec3..fc50003 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -21,8 +21,6 @@ #define NBD_H -#include "qemu-common.h" -#include "qemu/option.h" #include "io/channel-socket.h" #include "crypto/tlscreds.h" diff --git a/include/block/qapi.h b/include/block/qapi.h index 82ba4b6..83bdb09 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -25,7 +25,6 @@ #ifndef BLOCK_QAPI_H #define BLOCK_QAPI_H -#include "qapi-types.h" #include "block/block.h" #include "block/snapshot.h" diff --git a/include/block/snapshot.h b/include/block/snapshot.h index 9407799..f73d109 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -25,8 +25,6 @@ #ifndef SNAPSHOT_H #define SNAPSHOT_H -#include "qemu-common.h" -#include "qemu/option.h" #define SNAPSHOT_OPT_BASE "snapshot." diff --git a/include/chardev/char.h b/include/chardev/char.h index d8941fc..a381dc3 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -1,8 +1,6 @@ #ifndef QEMU_CHAR_H #define QEMU_CHAR_H -#include "qemu-common.h" -#include "qemu/option.h" #include "qemu/main-loop.h" #include "qemu/bitmap.h" #include "qom/object.h" diff --git a/include/crypto/random.h b/include/crypto/random.h index a07229c..8764ca0 100644 --- a/include/crypto/random.h +++ b/include/crypto/random.h @@ -22,8 +22,6 @@ #define QCRYPTO_RANDOM_H #include "qemu-common.h" -#include "qapi/error.h" - /** * qcrypto_random_bytes: diff --git a/include/crypto/xts.h b/include/crypto/xts.h index da32ab8..3c8967a 100644 --- a/include/crypto/xts.h +++ b/include/crypto/xts.h @@ -27,8 +27,6 @@ #define QCRYPTO_XTS_H #include "qemu-common.h" -#include "qapi/error.h" - #define XTS_BLOCK_SIZE 16 diff --git a/include/exec/tb-lookup.h b/include/exec/tb-lookup.h index 2961385..492cb68 100644 --- a/include/exec/tb-lookup.h +++ b/include/exec/tb-lookup.h @@ -7,8 +7,6 @@ #ifndef EXEC_TB_LOOKUP_H #define EXEC_TB_LOOKUP_H -#include "qemu/osdep.h" - #ifdef NEED_CPU_H #include "cpu.h" #else diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index 39ff512..c20ace0 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -21,7 +21,6 @@ */ #include "qemu/notify.h" -#include "qemu/option.h" #include "exec/memory.h" #include "hw/irq.h" #include "hw/acpi/acpi_dev_interface.h" diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h index 3c2e4e9..dabf4c4 100644 --- a/include/hw/acpi/acpi_dev_interface.h +++ b/include/hw/acpi/acpi_dev_interface.h @@ -2,7 +2,6 @@ #define ACPI_DEV_INTERFACE_H #include "qom/object.h" -#include "qapi-types.h" #include "hw/boards.h" /* These values are part of guest ABI, and can not be changed */ diff --git a/include/hw/block/block.h b/include/hw/block/block.h index 64b9298..f532d10 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -12,6 +12,7 @@ #define HW_BLOCK_H #include "qemu-common.h" +#include "qapi-types.h" /* Configuration */ diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 1749dab..68a0c90 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -2,6 +2,7 @@ #define HW_FDC_H #include "qemu-common.h" +#include "qapi-types.h" /* fdc.c */ #define MAX_FD 2 diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 31851b4..88212f5 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -12,7 +12,6 @@ #include "sysemu/sysemu.h" #include "hw/block/block.h" #include "scsi/constants.h" -#include "qapi/error.h" /* debug IDE devices */ #define USE_DMA_CDROM diff --git a/include/hw/intc/xlnx-pmu-iomod-intc.h b/include/hw/intc/xlnx-pmu-iomod-intc.h index 1fdba73..01c9d04 100644 --- a/include/hw/intc/xlnx-pmu-iomod-intc.h +++ b/include/hw/intc/xlnx-pmu-iomod-intc.h @@ -25,7 +25,6 @@ #ifndef XLNX_PMU_IO_INTC_H #define XLNX_PMU_IO_INTC_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zynqmp-ipi.h index 4afa4ff..866c719 100644 --- a/include/hw/intc/xlnx-zynqmp-ipi.h +++ b/include/hw/intc/xlnx-zynqmp-ipi.h @@ -25,7 +25,6 @@ #ifndef XLNX_ZYNQMP_IPI_H #define XLNX_ZYNQMP_IPI_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" diff --git a/include/hw/loader-fit.h b/include/hw/loader-fit.h index 9e2a068..0284c3e 100644 --- a/include/hw/loader-fit.h +++ b/include/hw/loader-fit.h @@ -20,7 +20,7 @@ #ifndef HW_LOADER_FIT_H #define HW_LOADER_FIT_H -#include <exec/hwaddr.h> +#include "exec/hwaddr.h" struct fit_loader_match { const char *compatible; diff --git a/include/hw/loader.h b/include/hw/loader.h index 355fe0f..5edbe02 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -1,6 +1,5 @@ #ifndef LOADER_H #define LOADER_H -#include "qapi/qmp/qdict.h" #include "hw/nvram/fw_cfg.h" /* loader.c */ diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 7ccbae5..b2259cc 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -1,7 +1,6 @@ #ifndef FW_CFG_H #define FW_CFG_H -#include "qemu/typedefs.h" #include "exec/hwaddr.h" #include "hw/nvram/fw_cfg_keys.h" #include "hw/sysbus.h" diff --git a/include/hw/pci-bridge/simba.h b/include/hw/pci-bridge/simba.h index fac56ab..e13ba27 100644 --- a/include/hw/pci-bridge/simba.h +++ b/include/hw/pci-bridge/simba.h @@ -24,7 +24,6 @@ * THE SOFTWARE. */ -#include "qemu/osdep.h" #include "hw/pci/pci_bridge.h" diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 18c0251..fc9d617 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -2,7 +2,6 @@ #define QDEV_CORE_H #include "qemu/queue.h" -#include "qemu/option.h" #include "qemu/bitmap.h" #include "qom/object.h" #include "hw/irq.h" diff --git a/include/hw/registerfields.h b/include/hw/registerfields.h index 44e0b94..2659a58 100644 --- a/include/hw/registerfields.h +++ b/include/hw/registerfields.h @@ -11,7 +11,7 @@ #ifndef REGISTERFIELDS_H #define REGISTERFIELDS_H -#include <qemu/bitops.h> +#include "qemu/bitops.h" /* Define constants for a 32 bit register */ diff --git a/include/hw/s390x/storage-attributes.h b/include/hw/s390x/storage-attributes.h index 9be954d..d6403a0 100644 --- a/include/hw/s390x/storage-attributes.h +++ b/include/hw/s390x/storage-attributes.h @@ -12,7 +12,7 @@ #ifndef S390_STORAGE_ATTRIBUTES_H #define S390_STORAGE_ATTRIBUTES_H -#include <hw/qdev.h> +#include "hw/qdev.h" #include "monitor/monitor.h" #define TYPE_S390_STATTRIB "s390-storage_attributes" diff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h index a83adb9..eeb5a4d 100644 --- a/include/hw/smbios/smbios.h +++ b/include/hw/smbios/smbios.h @@ -14,7 +14,6 @@ * */ -#include "qemu/option.h" #define SMBIOS_MAX_TYPE 127 diff --git a/include/hw/xtensa/xtensa-isa.h b/include/hw/xtensa/xtensa-isa.h index 353f82b..bd68ada 100644 --- a/include/hw/xtensa/xtensa-isa.h +++ b/include/hw/xtensa/xtensa-isa.h @@ -25,8 +25,6 @@ #ifndef XTENSA_LIBISA_H #define XTENSA_LIBISA_H -#include <stdint.h> - #ifdef __cplusplus extern "C" { #endif diff --git a/include/migration/colo.h b/include/migration/colo.h index ff9874e..50ace16 100644 --- a/include/migration/colo.h +++ b/include/migration/colo.h @@ -14,6 +14,7 @@ #define QEMU_COLO_H #include "qemu-common.h" +#include "qapi-types.h" void colo_info_init(void); diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 83ea4a1..ad64ad8 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -2,7 +2,6 @@ #define MONITOR_H #include "qemu-common.h" -#include "qapi/qmp/qdict.h" #include "block/block.h" #include "qemu/readline.h" diff --git a/include/net/net.h b/include/net/net.h index 4afac1a..3fc48e4 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -2,12 +2,9 @@ #define QEMU_NET_H #include "qemu/queue.h" -#include "qemu-common.h" -#include "qapi/qmp/qdict.h" -#include "qemu/option.h" +#include "qapi-types.h" #include "net/queue.h" #include "migration/vmstate.h" -#include "qapi-types.h" #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X" #define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \ diff --git a/include/net/slirp.h b/include/net/slirp.h index 0c98e46..4d63d74 100644 --- a/include/net/slirp.h +++ b/include/net/slirp.h @@ -24,10 +24,6 @@ #ifndef QEMU_NET_SLIRP_H #define QEMU_NET_SLIRP_H -#include "qemu-common.h" -#include "qapi/qmp/qdict.h" -#include "qemu/option.h" -#include "qapi-types.h" #ifdef CONFIG_SLIRP diff --git a/include/net/tap.h b/include/net/tap.h index 5da4edc..ce6f841 100644 --- a/include/net/tap.h +++ b/include/net/tap.h @@ -27,7 +27,6 @@ #define QEMU_NET_TAP_H #include "qemu-common.h" -#include "qapi-types.h" #include "standard-headers/linux/virtio_net.h" int tap_enable(NetClientState *nc); diff --git a/include/qapi/clone-visitor.h b/include/qapi/clone-visitor.h index a4915c7..b119d3d 100644 --- a/include/qapi/clone-visitor.h +++ b/include/qapi/clone-visitor.h @@ -11,7 +11,6 @@ #ifndef QAPI_CLONE_VISITOR_H #define QAPI_CLONE_VISITOR_H -#include "qemu/typedefs.h" #include "qapi/visitor.h" #include "qapi-visit.h" diff --git a/include/qapi/opts-visitor.h b/include/qapi/opts-visitor.h index 6462c96..9b989e7 100644 --- a/include/qapi/opts-visitor.h +++ b/include/qapi/opts-visitor.h @@ -14,7 +14,6 @@ #define OPTS_VISITOR_H #include "qapi/visitor.h" -#include "qemu/option.h" /* Inclusive upper bound on the size of any flattened range. This is a safety * (= anti-annoyance) measure; wrong ranges should not cause long startup diff --git a/include/qapi/qmp-event.h b/include/qapi/qmp-event.h index 40fe3cb..0c87ad8 100644 --- a/include/qapi/qmp-event.h +++ b/include/qapi/qmp-event.h @@ -14,7 +14,6 @@ #ifndef QMP_EVENT_H #define QMP_EVENT_H -#include "qapi/qmp/qdict.h" typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict, Error **errp); diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h index 20578dc..1e694b5 100644 --- a/include/qapi/qmp/dispatch.h +++ b/include/qapi/qmp/dispatch.h @@ -14,8 +14,7 @@ #ifndef QAPI_QMP_DISPATCH_H #define QAPI_QMP_DISPATCH_H -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qdict.h" +#include "qemu/queue.h" typedef void (QmpCommandFunc)(QDict *, QObject **, Error **); diff --git a/include/qapi/qmp/json-parser.h b/include/qapi/qmp/json-parser.h index 9987f8c..102f5c0 100644 --- a/include/qapi/qmp/json-parser.h +++ b/include/qapi/qmp/json-parser.h @@ -15,7 +15,6 @@ #define QEMU_JSON_PARSER_H #include "qemu-common.h" -#include "qapi/qmp/qlist.h" QObject *json_parser_parse(GQueue *tokens, va_list *ap); QObject *json_parser_parse_err(GQueue *tokens, va_list *ap, Error **errp); diff --git a/include/qapi/qmp/qbool.h b/include/qapi/qmp/qbool.h index f77ea86..629c508 100644 --- a/include/qapi/qmp/qbool.h +++ b/include/qapi/qmp/qbool.h @@ -16,10 +16,10 @@ #include "qapi/qmp/qobject.h" -typedef struct QBool { +struct QBool { QObject base; bool value; -} QBool; +}; QBool *qbool_from_bool(bool value); bool qbool_get_bool(const QBool *qb); diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index fc218e7..ff6f784 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -14,9 +14,6 @@ #define QDICT_H #include "qapi/qmp/qobject.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" #include "qemu/queue.h" #define QDICT_BUCKET_MAX 512 @@ -27,11 +24,11 @@ typedef struct QDictEntry { QLIST_ENTRY(QDictEntry) next; } QDictEntry; -typedef struct QDict { +struct QDict { QObject base; size_t size; QLIST_HEAD(,QDictEntry) table[QDICT_BUCKET_MAX]; -} QDict; +}; /* Object API */ QDict *qdict_new(void); @@ -55,17 +52,11 @@ void qdict_destroy_obj(QObject *obj); #define qdict_put(qdict, key, obj) \ qdict_put_obj(qdict, key, QOBJECT(obj)) -/* Helpers for int, bool, null, and string */ -#define qdict_put_int(qdict, key, value) \ - qdict_put(qdict, key, qnum_from_int(value)) -#define qdict_put_bool(qdict, key, value) \ - qdict_put(qdict, key, qbool_from_bool(value)) -#define qdict_put_str(qdict, key, value) \ - qdict_put(qdict, key, qstring_from_str(value)) -#define qdict_put_null(qdict, key) \ - qdict_put(qdict, key, qnull()) +void qdict_put_bool(QDict *qdict, const char *key, bool value); +void qdict_put_int(QDict *qdict, const char *key, int64_t value); +void qdict_put_null(QDict *qdict, const char *key); +void qdict_put_str(QDict *qdict, const char *key, const char *value); -/* High level helpers */ double qdict_get_double(const QDict *qdict, const char *key); int64_t qdict_get_int(const QDict *qdict, const char *key); bool qdict_get_bool(const QDict *qdict, const char *key); diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h index 6e84082..b274ac3 100644 --- a/include/qapi/qmp/qjson.h +++ b/include/qapi/qmp/qjson.h @@ -14,9 +14,6 @@ #ifndef QJSON_H #define QJSON_H -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qstring.h" - QObject *qobject_from_json(const char *string, Error **errp); QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2); QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp) diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h index ec3fcc1..5fd976a 100644 --- a/include/qapi/qmp/qlist.h +++ b/include/qapi/qmp/qlist.h @@ -14,8 +14,6 @@ #define QLIST_H #include "qapi/qmp/qobject.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qnull.h" #include "qemu/queue.h" typedef struct QListEntry { @@ -23,23 +21,18 @@ typedef struct QListEntry { QTAILQ_ENTRY(QListEntry) next; } QListEntry; -typedef struct QList { +struct QList { QObject base; QTAILQ_HEAD(,QListEntry) head; -} QList; +}; #define qlist_append(qlist, obj) \ qlist_append_obj(qlist, QOBJECT(obj)) -/* Helpers for int, bool, and string */ -#define qlist_append_int(qlist, value) \ - qlist_append(qlist, qnum_from_int(value)) -#define qlist_append_bool(qlist, value) \ - qlist_append(qlist, qbool_from_bool(value)) -#define qlist_append_str(qlist, value) \ - qlist_append(qlist, qstring_from_str(value)) -#define qlist_append_null(qlist) \ - qlist_append(qlist, qnull()) +void qlist_append_bool(QList *qlist, bool value); +void qlist_append_int(QList *qlist, int64_t value); +void qlist_append_null(QList *qlist); +void qlist_append_str(QList *qlist, const char *value); #define QLIST_FOREACH_ENTRY(qlist, var) \ for ((var) = ((qlist)->head.tqh_first); \ diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h index b18406b..56f9d97 100644 --- a/include/qapi/qmp/qlit.h +++ b/include/qapi/qmp/qlit.h @@ -14,7 +14,6 @@ #ifndef QLIT_H #define QLIT_H -#include "qapi-types.h" #include "qobject.h" typedef struct QLitDictEntry QLitDictEntry; diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h index c3d8679..15e3971 100644 --- a/include/qapi/qmp/qnum.h +++ b/include/qapi/qmp/qnum.h @@ -44,7 +44,7 @@ typedef enum { * in range: qnum_get_try_int() / qnum_get_try_uint() check range and * convert under the hood. */ -typedef struct QNum { +struct QNum { QObject base; QNumKind kind; union { @@ -52,7 +52,7 @@ typedef struct QNum { uint64_t u64; double dbl; } u; -} QNum; +}; QNum *qnum_from_int(int64_t value); QNum *qnum_from_uint(uint64_t value); diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h index 65c05a9..98070ef 100644 --- a/include/qapi/qmp/qstring.h +++ b/include/qapi/qmp/qstring.h @@ -15,12 +15,12 @@ #include "qapi/qmp/qobject.h" -typedef struct QString { +struct QString { QObject base; char *string; size_t length; size_t capacity; -} QString; +}; QString *qstring_new(void); QString *qstring_from_str(const char *str); diff --git a/include/qapi/qmp/types.h b/include/qapi/qmp/types.h deleted file mode 100644 index 749ac44..0000000 --- a/include/qapi/qmp/types.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Include all QEMU objects. - * - * Copyright (C) 2009 Red Hat Inc. - * - * Authors: - * Luiz Capitulino <lcapitulino@redhat.com> - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. - * See the COPYING.LIB file in the top-level directory. - */ - -#ifndef QAPI_QMP_TYPES_H -#define QAPI_QMP_TYPES_H - -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" - -#endif /* QAPI_QMP_TYPES_H */ diff --git a/include/qapi/qobject-input-visitor.h b/include/qapi/qobject-input-visitor.h index daee18c..95985e2 100644 --- a/include/qapi/qobject-input-visitor.h +++ b/include/qapi/qobject-input-visitor.h @@ -16,7 +16,6 @@ #define QOBJECT_INPUT_VISITOR_H #include "qapi/visitor.h" -#include "qapi/qmp/qobject.h" typedef struct QObjectInputVisitor QObjectInputVisitor; diff --git a/include/qapi/qobject-output-visitor.h b/include/qapi/qobject-output-visitor.h index e5a3490..2b1726b 100644 --- a/include/qapi/qobject-output-visitor.h +++ b/include/qapi/qobject-output-visitor.h @@ -15,7 +15,6 @@ #define QOBJECT_OUTPUT_VISITOR_H #include "qapi/visitor.h" -#include "qapi/qmp/qobject.h" typedef struct QObjectOutputVisitor QObjectOutputVisitor; diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index 62a51a5..ecff296 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -15,7 +15,7 @@ #ifndef QAPI_VISITOR_H #define QAPI_VISITOR_H -#include "qapi/qmp/qobject.h" +#include "qapi-types.h" /* * The QAPI schema defines both a set of C data types, and a QMP wire diff --git a/include/qemu-common.h b/include/qemu-common.h index 05319b9..8a4f63c 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -16,8 +16,6 @@ #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) -#include "qemu/option.h" - /* Copyright string for -version arguments, About dialogs, etc */ #define QEMU_COPYRIGHT "Copyright (c) 2003-2017 " \ "Fabrice Bellard and the QEMU Project developers" diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index c80d5c8..d74f920 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -1,8 +1,6 @@ #ifndef QEMU_CONFIG_FILE_H #define QEMU_CONFIG_FILE_H -#include "qemu/option.h" -#include "qapi/qmp/qdict.h" QemuOptsList *qemu_find_opts(const char *group); QemuOptsList *qemu_find_opts_err(const char *group, Error **errp); diff --git a/include/qemu/option.h b/include/qemu/option.h index a88c5f0..b127fb6 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -27,7 +27,6 @@ #define QEMU_OPTION_H #include "qemu/queue.h" -#include "qapi/qmp/qdict.h" const char *get_opt_name(char *buf, int buf_size, const char *p, char delim); const char *get_opt_value(char *buf, int buf_size, const char *p); diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h index 8c93237..03d45f4 100644 --- a/include/qemu/throttle.h +++ b/include/qemu/throttle.h @@ -26,6 +26,7 @@ #define THROTTLE_H #include "qemu-common.h" +#include "qapi-types.h" #include "qemu/timer.h" #define THROTTLE_VALUE_MAX 1000000000000000LL diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 5923849..a46b0b3 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -96,8 +96,13 @@ typedef struct QemuSpin QemuSpin; typedef struct QEMUSGList QEMUSGList; typedef struct QEMUTimer QEMUTimer; typedef struct QEMUTimerListGroup QEMUTimerListGroup; -typedef struct QObject QObject; +typedef struct QBool QBool; +typedef struct QDict QDict; +typedef struct QList QList; typedef struct QNull QNull; +typedef struct QNum QNum; +typedef struct QObject QObject; +typedef struct QString QString; typedef struct RAMBlock RAMBlock; typedef struct Range Range; typedef struct SerialState SerialState; diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h index d23e11b..4d513fb 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -2,7 +2,6 @@ #define OBJECT_INTERFACES_H #include "qom/object.h" -#include "qapi/qmp/qdict.h" #include "qapi/visitor.h" #define TYPE_USER_CREATABLE "user-creatable" diff --git a/include/scsi/pr-manager.h b/include/scsi/pr-manager.h index b2b37d6..5d2f13a 100644 --- a/include/scsi/pr-manager.h +++ b/include/scsi/pr-manager.h @@ -2,7 +2,6 @@ #define PR_MANAGER_H #include "qom/object.h" -#include "qapi/qmp/qdict.h" #include "qapi/visitor.h" #include "qom/object_interfaces.h" #include "block/aio.h" diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index f999bfd..d40d882 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -1,8 +1,7 @@ #ifndef QEMU_ARCH_INIT_H #define QEMU_ARCH_INIT_H -#include "qmp-commands.h" -#include "qemu/option.h" +#include "qapi-types.h" enum { QEMU_ARCH_ALL = -1, diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h index df43bd0..c14bcfe 100644 --- a/include/sysemu/dump.h +++ b/include/sysemu/dump.h @@ -38,7 +38,6 @@ #include "sysemu/dump-arch.h" #include "sysemu/memory_mapping.h" -#include "qapi-types.h" typedef struct QEMU_PACKED MakedumpfileHeader { char signature[16]; /* = "makedumpfile" */ diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index ed6a437..621a3f9 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -16,7 +16,6 @@ #include "sysemu/sysemu.h" /* for MAX_NODES */ #include "qom/object.h" #include "exec/memory.h" -#include "qemu/option.h" #include "qemu/bitmap.h" #define TYPE_MEMORY_BACKEND "memory-backend" diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index e4e43f6..2411188 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -12,8 +12,6 @@ #ifndef _HVF_H #define _HVF_H -#include "config-host.h" -#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/bitops.h" #include "exec/memory.h" diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index b354521..d99e547 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -2,7 +2,6 @@ #define SYSEMU_NUMA_H #include "qemu/bitmap.h" -#include "qemu/option.h" #include "sysemu/sysemu.h" #include "sysemu/hostmem.h" #include "hw/boards.h" diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index fa14d0e..dc8ae7b 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -12,7 +12,6 @@ * */ -#include "qapi-types.h" #include "sysemu.h" /* replay clock kinds */ diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 1c92530..77bb3da 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -2,10 +2,8 @@ #define SYSEMU_H /* Misc. things related to the system emulator. */ -#include "qemu/option.h" #include "qemu/queue.h" #include "qemu/timer.h" -#include "qapi-types.h" #include "qemu/notify.h" #include "qemu/main-loop.h" #include "qemu/bitmap.h" diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index 233b1a3..32b753d 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -13,7 +13,6 @@ #define QEMU_TPM_H #include "qom/object.h" -#include "qapi-types.h" int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); int tpm_init(void); diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index 7e166ef..1448882 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -15,7 +15,6 @@ #include "qom/object.h" #include "qemu-common.h" -#include "qapi-types.h" #include "qemu/option.h" #include "sysemu/tpm.h" #include "qapi/error.h" diff --git a/include/ui/console.h b/include/ui/console.h index 7b35778..12fef80 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -3,12 +3,8 @@ #include "ui/qemu-pixman.h" #include "qom/object.h" -#include "qapi/qmp/qdict.h" #include "qemu/notify.h" -#include "qemu/typedefs.h" -#include "qapi-types.h" #include "qemu/error-report.h" -#include "qapi/error.h" #ifdef CONFIG_OPENGL # include <epoxy/gl.h> @@ -468,31 +464,10 @@ static inline void cocoa_display_init(DisplayState *ds, int full_screen) void vnc_display_init(const char *id); void vnc_display_open(const char *id, Error **errp); void vnc_display_add_client(const char *id, int csock, bool skipauth); -#ifdef CONFIG_VNC int vnc_display_password(const char *id, const char *password); int vnc_display_pw_expire(const char *id, time_t expires); QemuOpts *vnc_parse(const char *str, Error **errp); int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp); -#else -static inline int vnc_display_password(const char *id, const char *password) -{ - return -ENODEV; -} -static inline int vnc_display_pw_expire(const char *id, time_t expires) -{ - return -ENODEV; -}; -static inline QemuOpts *vnc_parse(const char *str, Error **errp) -{ - error_setg(errp, "VNC support is disabled"); - return NULL; -} -static inline int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp) -{ - error_setg(errp, "VNC support is disabled"); - return -1; -} -#endif /* curses.c */ #ifdef CONFIG_CURSES diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index 52a9f88..c6d50eb 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -23,7 +23,6 @@ #ifdef CONFIG_SPICE #include <spice.h> -#include "qemu/option.h" #include "qemu/config-file.h" extern int using_spice; diff --git a/io/channel-websock.c b/io/channel-websock.c index 87ebdeb..7fd6bb6 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -26,9 +26,6 @@ #include "trace.h" #include "qemu/iov.h" -#include <time.h> - - /* Max amount to allow in rawinput/encoutput buffers */ #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192 @@ -19,6 +19,7 @@ #include "block/block.h" #include "sysemu/iothread.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/rcu.h" #include "qemu/main-loop.h" diff --git a/linux-user/syscall.c b/linux-user/syscall.c index df1edf0..82b35a6 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -44,7 +44,6 @@ #include <sys/shm.h> #include <sys/sem.h> #include <sys/statfs.h> -#include <time.h> #include <utime.h> #include <sys/sysinfo.h> #include <sys/signalfd.h> diff --git a/migration/colo-failover.c b/migration/colo-failover.c index 6563862..891785c 100644 --- a/migration/colo-failover.c +++ b/migration/colo-failover.c @@ -16,6 +16,7 @@ #include "qemu/main-loop.h" #include "migration.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/migration/colo.c b/migration/colo.c index dee3aa8..245a46d 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qemu-file-channel.h" #include "migration.h" #include "qemu-file.h" diff --git a/migration/exec.c b/migration/exec.c index c953797..0bc5a42 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "channel.h" #include "exec.h" #include "io/channel-command.h" diff --git a/migration/fd.c b/migration/fd.c index 6284a97..cd06182 100644 --- a/migration/fd.c +++ b/migration/fd.c @@ -15,7 +15,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "channel.h" #include "fd.h" #include "monitor/monitor.h" diff --git a/migration/migration.c b/migration/migration.c index 0fdb2e4..86d6912 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -30,7 +30,9 @@ #include "qemu-file.h" #include "migration/vmstate.h" #include "block/block.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qnull.h" #include "qemu/rcu.h" #include "block.h" #include "postcopy-ram.h" diff --git a/migration/migration.h b/migration/migration.h index d3b214e..848f638 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -16,7 +16,6 @@ #include "qemu-common.h" #include "qemu/thread.h" -#include "qapi-types.h" #include "exec/cpu-common.h" #include "qemu/coroutine_int.h" #include "hw/qdev.h" diff --git a/migration/ram.c b/migration/ram.c index 5a109ef..8333d8e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -25,6 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "cpu.h" #include <zlib.h> @@ -42,6 +43,7 @@ #include "postcopy-ram.h" #include "migration/page_cache.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "trace.h" #include "exec/ram_addr.h" diff --git a/migration/ram.h b/migration/ram.h index 64d81e9..f3a227b 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -30,6 +30,7 @@ #define QEMU_MIGRATION_RAM_H #include "qemu-common.h" +#include "qapi-types.h" #include "exec/cpu-common.h" extern MigrationStats ram_counters; diff --git a/migration/savevm.c b/migration/savevm.c index f202c3d..3f611c0 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -40,6 +40,7 @@ #include "qemu-file.h" #include "savevm.h" #include "postcopy-ram.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "sysemu/cpus.h" @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include <dirent.h> -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "monitor/qdev.h" @@ -51,8 +51,10 @@ #include "sysemu/hw_accel.h" #include "qemu/acl.h" #include "sysemu/tpm.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" @@ -66,17 +68,18 @@ #include "exec/memory.h" #include "exec/exec-all.h" #include "qemu/log.h" +#include "qemu/option.h" #include "qmp-commands.h" #include "hmp.h" #include "qemu/thread.h" #include "block/qapi.h" +#include "qapi/error.h" #include "qapi/qmp-event.h" #include "qapi-event.h" #include "qmp-introspect.h" #include "sysemu/qtest.h" #include "sysemu/cpus.h" #include "qemu/cutils.h" -#include "qapi/qmp/dispatch.h" #if defined(TARGET_S390X) #include "hw/s390x/storage-keys.h" diff --git a/nbd/common.c b/nbd/common.c index 6047d71..6295526 100644 --- a/nbd/common.c +++ b/nbd/common.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "trace.h" #include "nbd-internal.h" diff --git a/net/clients.h b/net/clients.h index 5cae479..a6ef267 100644 --- a/net/clients.h +++ b/net/clients.h @@ -25,7 +25,6 @@ #define QEMU_NET_CLIENTS_H #include "net/net.h" -#include "qapi-types.h" int net_init_dump(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp); diff --git a/net/colo-compare.c b/net/colo-compare.c index 8622b0b..76e03fd 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -16,7 +16,6 @@ #include "qemu/error-report.h" #include "trace.h" #include "qemu-common.h" -#include "qapi/qmp/qerror.h" #include "qapi/error.h" #include "net/net.h" #include "net/eth.h" diff --git a/net/filter-mirror.c b/net/filter-mirror.c index ce0dc23..bd78e25 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -14,7 +14,6 @@ #include "net/net.h" #include "qemu-common.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "qapi-visit.h" #include "qom/object.h" #include "qemu/main-loop.h" diff --git a/net/filter-replay.c b/net/filter-replay.c index cff65f8..09e68fd 100644 --- a/net/filter-replay.c +++ b/net/filter-replay.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "clients.h" -#include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/iov.h" diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 2be388f..6201494 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -15,8 +15,6 @@ #include "net/filter.h" #include "net/net.h" #include "qemu-common.h" -#include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qapi-visit.h" #include "qom/object.h" @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "net/net.h" @@ -31,8 +32,8 @@ #include "util.h" #include "monitor/monitor.h" -#include "qemu-common.h" #include "qemu/help_option.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/sockets.h" @@ -42,7 +43,9 @@ #include "hw/qdev.h" #include "qemu/iov.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" diff --git a/net/slirp.c b/net/slirp.c index 7044d29..8991816 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "net/slirp.h" @@ -41,6 +42,7 @@ #include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) { diff --git a/net/vhost-user.c b/net/vhost-user.c index c23927c..cb45512 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -13,8 +13,10 @@ #include "net/vhost_net.h" #include "net/vhost-user.h" #include "chardev/char-fe.h" +#include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qmp-commands.h" #include "trace.h" @@ -30,6 +30,7 @@ #include "qom/cpu.h" #include "qemu/error-report.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "hw/boards.h" #include "sysemu/hostmem.h" diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index ed70a01..fd23803 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -14,9 +14,9 @@ #include "qemu/osdep.h" #include "qapi/dealloc-visitor.h" +#include "qapi/qmp/qnull.h" #include "qemu/queue.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" #include "qapi/visitor-impl.h" struct QapiDeallocVisitor diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 3dcb968..d9a1137 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qapi/visitor-impl.h" diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index b41fa17..e31ac4b 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -13,12 +13,10 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" -#include "qapi-types.h" -#include "qapi/qmp/qerror.h" static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp) { diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c index ba3029c..9d7e88e 100644 --- a/qapi/qmp-event.c +++ b/qapi/qmp-event.c @@ -16,6 +16,7 @@ #include "qemu-common.h" #include "qapi/qmp-event.h" #include "qapi/qmp/qstring.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" static QMPEventFuncEmit qmp_emit; diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index ee9e47d..023317b 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -20,8 +20,13 @@ #include "qemu/queue.h" #include "qemu-common.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/option.h" diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c index d325163..7c3b42c 100644 --- a/qapi/qobject-output-visitor.c +++ b/qapi/qobject-output-visitor.c @@ -17,7 +17,12 @@ #include "qapi/visitor-impl.h" #include "qemu/queue.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" typedef struct QStackEntry { QObject *value; diff --git a/qdev-monitor.c b/qdev-monitor.c index c436616..8462381 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -24,10 +24,13 @@ #include "monitor/qdev.h" #include "qmp-commands.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/help_option.h" +#include "qemu/option.h" #include "sysemu/block-backend.h" #include "migration/misc.h" @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include <getopt.h> @@ -28,9 +29,9 @@ #include "qapi/error.h" #include "qapi-visit.h" #include "qapi/qobject-output-visitor.h" -#include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h" diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index a6a70fc..9b3cd00 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -17,6 +17,7 @@ #include "block/qapi.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qemu/timer.h" #include "qemu/cutils.h" @@ -7,6 +7,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include <getopt.h> #include <libgen.h> @@ -20,7 +21,7 @@ #include "qemu/readline.h" #include "qemu/log.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qom/object_interfaces.h" #include "sysemu/block-backend.h" #include "block/block_int.h" diff --git a/qemu-keymap.c b/qemu-keymap.c index 49e9167..6216371 100644 --- a/qemu-keymap.c +++ b/qemu-keymap.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi-types.h" #include "qemu/notify.h" #include "ui/input.h" @@ -22,18 +22,19 @@ #include <pthread.h> #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/cutils.h" #include "sysemu/block-backend.h" #include "block/block_int.h" #include "block/nbd.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qemu/error-report.h" #include "qemu/config-file.h" #include "qemu/bswap.h" #include "qemu/log.h" #include "qemu/systemd.h" #include "block/snapshot.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qom/object_interfaces.h" #include "io/channel-socket.h" diff --git a/qga/commands-posix.c b/qga/commands-posix.c index e809e38..88807f3 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -18,6 +18,7 @@ #include <dirent.h> #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/queue.h" #include "qemu/host-utils.h" diff --git a/qga/commands-win32.c b/qga/commands-win32.c index d79974f..bedae32 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -14,6 +14,7 @@ #ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0600 #endif + #include "qemu/osdep.h" #include <wtypes.h> #include <powrprof.h> @@ -34,6 +35,7 @@ #include "qga/guest-agent-core.h" #include "qga/vss-win32.h" #include "qga-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/queue.h" #include "qemu/host-utils.h" diff --git a/qga/commands.c b/qga/commands.c index ff89e80..6d710db 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/base64.h" #include "qemu/cutils.h" diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h index 3e8a4ac..6f4d214 100644 --- a/qga/guest-agent-core.h +++ b/qga/guest-agent-core.h @@ -12,7 +12,7 @@ */ #include "qapi/qmp/dispatch.h" #include "qemu-common.h" -#include "qga-qmp-commands.h" +#include "qga-qapi-types.h" #define QGA_READ_COUNT_DEFAULT 4096 @@ -10,6 +10,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include <getopt.h> #include <glib/gstdio.h> @@ -19,11 +20,14 @@ #endif #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "qga/guest-agent-core.h" #include "qemu/module.h" +#include "qga-qmp-commands.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/dispatch.h" +#include "qapi/error.h" #include "qga/channel.h" #include "qemu/bswap.h" #include "qemu/help_option.h" diff --git a/qga/vss-win32.c b/qga/vss-win32.c index dcb2756..0199c2a 100644 --- a/qga/vss-win32.c +++ b/qga/vss-win32.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include <windows.h> +#include "qapi/error.h" #include "qemu/error-report.h" #include "qga/guest-agent-core.h" #include "qga/vss-win32.h" @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qemu-version.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "qemu/config-file.h" @@ -30,8 +31,9 @@ #include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "qom/qom-qobject.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qobject.h" #include "qapi/qobject-input-visitor.h" #include "hw/boards.h" #include "qom/object_interfaces.h" diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 724ca24..b724562 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -15,7 +15,12 @@ #include "qemu/cutils.h" #include "qapi/error.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-lexer.h" #include "qapi/qmp/json-streamer.h" diff --git a/qobject/qbool.c b/qobject/qbool.c index ac825fc..e5a7a53 100644 --- a/qobject/qbool.c +++ b/qobject/qbool.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "qapi/qmp/qbool.h" -#include "qapi/qmp/qobject.h" #include "qemu-common.h" /** diff --git a/qobject/qdict.c b/qobject/qdict.c index e8f15f1..23df84f 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -14,8 +14,9 @@ #include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnull.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qobject.h" #include "qapi/error.h" #include "qemu/queue.h" #include "qemu-common.h" @@ -143,6 +144,26 @@ void qdict_put_obj(QDict *qdict, const char *key, QObject *value) } } +void qdict_put_int(QDict *qdict, const char *key, int64_t value) +{ + qdict_put(qdict, key, qnum_from_int(value)); +} + +void qdict_put_bool(QDict *qdict, const char *key, bool value) +{ + qdict_put(qdict, key, qbool_from_bool(value)); +} + +void qdict_put_str(QDict *qdict, const char *key, const char *value) +{ + qdict_put(qdict, key, qstring_from_str(value)); +} + +void qdict_put_null(QDict *qdict, const char *key) +{ + qdict_put(qdict, key, qnull()); +} + /** * qdict_get(): Lookup for a given 'key' * diff --git a/qobject/qjson.c b/qobject/qjson.c index 2e09308..e1ce756 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -17,7 +17,11 @@ #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu/unicode.h" typedef struct JSONParsingState diff --git a/qobject/qlist.c b/qobject/qlist.c index 3ef57d3..613a95c 100644 --- a/qobject/qlist.c +++ b/qobject/qlist.c @@ -11,8 +11,11 @@ */ #include "qemu/osdep.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qlist.h" -#include "qapi/qmp/qobject.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu/queue.h" #include "qemu-common.h" @@ -64,6 +67,26 @@ void qlist_append_obj(QList *qlist, QObject *value) QTAILQ_INSERT_TAIL(&qlist->head, entry, next); } +void qlist_append_int(QList *qlist, int64_t value) +{ + qlist_append(qlist, qnum_from_int(value)); +} + +void qlist_append_bool(QList *qlist, bool value) +{ + qlist_append(qlist, qbool_from_bool(value)); +} + +void qlist_append_str(QList *qlist, const char *value) +{ + qlist_append(qlist, qstring_from_str(value)); +} + +void qlist_append_null(QList *qlist) +{ + qlist_append(qlist, qnull()); +} + /** * qlist_iter(): Iterate over all the list's stored values. * diff --git a/qobject/qlit.c b/qobject/qlit.c index 3c4882c..948e0b8 100644 --- a/qobject/qlit.c +++ b/qobject/qlit.c @@ -16,7 +16,11 @@ #include "qemu/osdep.h" #include "qapi/qmp/qlit.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" static bool qlit_equal_qdict(const QLitObject *lhs, const QDict *qdict) { diff --git a/qobject/qnum.c b/qobject/qnum.c index 410686a..60c395c 100644 --- a/qobject/qnum.c +++ b/qobject/qnum.c @@ -13,9 +13,7 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qapi/qmp/qnum.h" -#include "qapi/qmp/qobject.h" #include "qemu-common.h" /** diff --git a/qobject/qobject.c b/qobject/qobject.c index b2a5360..23600aa 100644 --- a/qobject/qobject.c +++ b/qobject/qobject.c @@ -9,7 +9,12 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qstring.h" static void (*qdestroy[QTYPE__MAX])(QObject *) = { [QTYPE_NONE] = NULL, /* No such object exists */ diff --git a/qobject/qstring.c b/qobject/qstring.c index 74182a1..05b4bbc 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" #include "qemu-common.h" diff --git a/qom/object.c b/qom/object.c index c58c52d..5dcee46 100644 --- a/qom/object.c +++ b/qom/object.c @@ -25,8 +25,8 @@ /* TODO: replace QObject with a simpler visitor to avoid a dependency * of the QOM core on QObject? */ #include "qom/qom-qobject.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #define MAX_INTERFACES 32 diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 6824a88..80d0913 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -1,7 +1,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qom/object_interfaces.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qapi-visit.h" #include "qapi/opts-visitor.h" #include "qemu/config-file.h" diff --git a/replay/replay-input.c b/replay/replay-input.c index bd93554..3ab1536 100644 --- a/replay/replay-input.c +++ b/replay/replay-input.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h" diff --git a/replay/replay.c b/replay/replay.c index ff58a5a..7a23c62 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -11,11 +11,11 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h" #include "qemu/timer.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "sysemu/cpus.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 974d0a4..f89d748 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -289,14 +289,16 @@ h_comment = ''' c_comment, h_comment) fdef.write(mcgen(''' + #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/module.h" -#include "qapi/qmp/types.h" #include "qapi/visitor.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/dealloc-visitor.h" +#include "qapi/error.h" #include "%(prefix)sqapi-types.h" #include "%(prefix)sqapi-visit.h" #include "%(prefix)sqmp-commands.h" @@ -306,9 +308,7 @@ fdef.write(mcgen(''' fdecl.write(mcgen(''' #include "%(prefix)sqapi-types.h" -#include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" -#include "qapi/error.h" void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); ''', diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index 07b4b70..c710968 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -209,6 +209,8 @@ fdef.write(mcgen(''' #include "qemu-common.h" #include "%(prefix)sqapi-event.h" #include "%(prefix)sqapi-visit.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp-event.h" @@ -216,9 +218,7 @@ fdef.write(mcgen(''' prefix=prefix)) fdecl.write(mcgen(''' -#include "qapi/error.h" #include "qapi/util.h" -#include "qapi/qmp/qdict.h" #include "%(prefix)sqapi-types.h" ''', diff --git a/scsi/pr-helper.h b/scsi/pr-helper.h index 96c50a9..096d1f1 100644 --- a/scsi/pr-helper.h +++ b/scsi/pr-helper.h @@ -26,8 +26,6 @@ #ifndef QEMU_PR_HELPER_H #define QEMU_PR_HELPER_H 1 -#include <stdint.h> - #define PR_HELPER_CDB_SIZE 16 #define PR_HELPER_SENSE_SIZE 96 #define PR_HELPER_DATA_SIZE 8192 diff --git a/stubs/arch-query-cpu-def.c b/stubs/arch-query-cpu-def.c index cefe4be..d436f95 100644 --- a/stubs/arch-query-cpu-def.c +++ b/stubs/arch-query-cpu-def.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) diff --git a/stubs/arch-query-cpu-model-baseline.c b/stubs/arch-query-cpu-model-baseline.c index 094ec13..0d066da 100644 --- a/stubs/arch-query-cpu-model-baseline.c +++ b/stubs/arch-query-cpu-model-baseline.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *modela, diff --git a/stubs/arch-query-cpu-model-comparison.c b/stubs/arch-query-cpu-model-comparison.c index d5486ae..8eb311a 100644 --- a/stubs/arch-query-cpu-model-comparison.c +++ b/stubs/arch-query-cpu-model-comparison.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *modela, diff --git a/stubs/arch-query-cpu-model-expansion.c b/stubs/arch-query-cpu-model-expansion.c index ae7cf55..26273a8 100644 --- a/stubs/arch-query-cpu-model-expansion.c +++ b/stubs/arch-query-cpu-model-expansion.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" CpuModelExpansionInfo *arch_query_cpu_model_expansion(CpuModelExpansionType type, diff --git a/stubs/dump.c b/stubs/dump.c index d9ee23f..8e5032c 100644 --- a/stubs/dump.c +++ b/stubs/dump.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/dump-arch.h" -#include "qmp-commands.h" int cpu_get_dump_info(ArchDumpInfo *info, const struct GuestPhysBlockList *guest_phys_blocks) diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c index c64eb7a..3c8fe55 100644 --- a/stubs/vmgenid.c +++ b/stubs/vmgenid.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" GuidInfo *qmp_query_vm_generation_id(Error **errp) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d70954b..b5e431e 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + #include "qemu/osdep.h" #include "qemu/cutils.h" @@ -29,10 +30,10 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/types.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qapi/visitor.h" #include "qom/qom-qobject.h" diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index 934ec4a..bc9a12c 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -30,7 +30,6 @@ #include "exec/ioport.h" #include "qemu-common.h" -#include "strings.h" #include "hax-i386.h" #include "sysemu/accel.h" #include "sysemu/sysemu.h" diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 85e5964..15870a4 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -70,7 +70,6 @@ #include "hw/i386/apic_internal.h" #include "hw/boards.h" #include "qemu/main-loop.h" -#include "strings.h" #include "sysemu/accel.h" #include "sysemu/sysemu.h" #include "target/i386/cpu.h" diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h index 162a7d5..5dc52ec 100644 --- a/target/i386/hvf/vmx.h +++ b/target/i386/hvf/vmx.h @@ -25,7 +25,6 @@ #ifndef VMX_H #define VMX_H -#include <stdint.h> #include <Hypervisor/hv.h> #include <Hypervisor/hv_vmx.h> #include "vmcs.h" diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c index bf93e82..2d7540f 100644 --- a/target/i386/hvf/x86_decode.c +++ b/target/i386/hvf/x86_decode.c @@ -21,7 +21,6 @@ #include "qemu-common.h" #include "panic.h" #include "x86_decode.h" -#include "string.h" #include "vmx.h" #include "x86_mmu.h" #include "x86_descr.h" diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c index 5c1f35a..c6be2cc 100644 --- a/target/i386/hvf/x86_mmu.c +++ b/target/i386/hvf/x86_mmu.c @@ -15,18 +15,16 @@ * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ + #include "qemu/osdep.h" +#include <memory.h> #include "panic.h" - #include "qemu-common.h" #include "cpu.h" #include "x86.h" #include "x86_mmu.h" -#include "string.h" #include "vmcs.h" #include "vmx.h" - -#include "memory.h" #include "exec/address-spaces.h" #define pte_present(pte) (pte & PT_PRESENT) diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c index d7f665f..4abf3db 100644 --- a/target/i386/hvf/x86_task.c +++ b/target/i386/hvf/x86_task.c @@ -32,7 +32,6 @@ #include "hw/i386/apic_internal.h" #include "hw/boards.h" #include "qemu/main-loop.h" -#include "strings.h" #include "sysemu/accel.h" #include "sysemu/sysemu.h" #include "target/i386/cpu.h" diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 7803e09..6c88939 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -29,11 +29,8 @@ #include "hw/i386/apic_internal.h" -#include <stdio.h> -#include <stdlib.h> #include <Hypervisor/hv.h> #include <Hypervisor/hv_vmx.h> -#include <stdint.h> void hvf_set_segment(struct CPUState *cpu, struct vmx_segment *vmx_seg, SegmentCache *qseg, bool is_tr) diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 75e155f..7542912 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -21,10 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" #include "monitor/hmp-target.h" +#include "qapi/qmp/qdict.h" #include "hw/i386/pc.h" #include "sysemu/kvm.h" #include "hmp.h" diff --git a/target/i386/xsave_helper.c b/target/i386/xsave_helper.c index ca735ee..52ea7e6 100644 --- a/target/i386/xsave_helper.c +++ b/target/i386/xsave_helper.c @@ -3,7 +3,6 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" diff --git a/target/nios2/helper.c b/target/nios2/helper.c index a169c91..a8b8ec6 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -22,7 +22,6 @@ #include "cpu.h" #include "qemu/host-utils.h" -#include "qapi/error.h" #include "exec/exec-all.h" #include "exec/log.h" #include "exec/helper-proto.h" diff --git a/target/ppc/mmu-book3s-v3.c b/target/ppc/mmu-book3s-v3.c index e7798b3..b60df44 100644 --- a/target/ppc/mmu-book3s-v3.c +++ b/target/ppc/mmu-book3s-v3.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "mmu-hash64.h" #include "mmu-book3s-v3.h" diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c index 14d34e5..c9b72b7 100644 --- a/target/ppc/mmu-hash64.c +++ b/target/ppc/mmu-hash64.c @@ -18,7 +18,6 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c index bbd37e3..ab76cbc 100644 --- a/target/ppc/mmu-radix64.c +++ b/target/ppc/mmu-radix64.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 16ef5ac..5568d16 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -17,7 +17,6 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "exec/helper-proto.h" #include "sysemu/kvm.h" diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index e7b1044..48f2c10 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -29,6 +29,8 @@ #include "mmu-hash32.h" #include "mmu-hash64.h" #include "qemu/error-report.h" +#include "qapi/error.h" +#include "qapi/qmp/qnull.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" #include "hw/ppc/ppc.h" diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 250d931..1d5f0da 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -20,7 +20,7 @@ #include "qemu/error-report.h" #include "qapi/qmp/qerror.h" #include "qapi/qobject-input-visitor.h" -#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #ifndef CONFIG_USER_ONLY #include "sysemu/arch_init.h" #include "hw/pci/pci.h" diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index 86ec9e6..411051e 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "internal.h" #include "qemu/timer.h" diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index f6211b4..0cdbc15 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -9,12 +9,10 @@ * This work is licensed under the terms of the GNU GPL, version 2 or (at * your option) any later version. See the COPYING file in the top-level * directory. - * */ - -#include "inttypes.h" -#include "stdio.h" +#include <inttypes.h> +#include <stdio.h> #include "cpu_features_def.h" #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 35d9741..84aaef3 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "internal.h" #include "exec/gdbstub.h" diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index deb8709..0301e9d 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -31,13 +31,13 @@ #include "cpu.h" #include "internal.h" #include "kvm_s390x.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/hw_accel.h" #include "hw/hw.h" #include "sysemu/device_tree.h" -#include "qapi/qmp/qjson.h" #include "exec/gdbstub.h" #include "exec/address-spaces.h" #include "trace.h" diff --git a/target/xtensa/core-dc232b/xtensa-modules.c b/target/xtensa/core-dc232b/xtensa-modules.c index 2e103cd..d322c3f 100644 --- a/target/xtensa/core-dc232b/xtensa-modules.c +++ b/target/xtensa/core-dc232b/xtensa-modules.c @@ -18,7 +18,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <xtensa-isa.h> +#include "qemu/osdep.h" +#include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/core-dc233c/xtensa-modules.c b/target/xtensa/core-dc233c/xtensa-modules.c index 2728311..7c20f82 100644 --- a/target/xtensa/core-dc233c/xtensa-modules.c +++ b/target/xtensa/core-dc233c/xtensa-modules.c @@ -21,7 +21,8 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <xtensa-isa.h> +#include "qemu/osdep.h" +#include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/core-de212/xtensa-modules.c b/target/xtensa/core-de212/xtensa-modules.c index 4a87358..ef7674d 100644 --- a/target/xtensa/core-de212/xtensa-modules.c +++ b/target/xtensa/core-de212/xtensa-modules.c @@ -21,7 +21,8 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <xtensa-isa.h> +#include "qemu/osdep.h" +#include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/core-fsf/xtensa-modules.c b/target/xtensa/core-fsf/xtensa-modules.c index 238800d..f7de2de 100644 --- a/target/xtensa/core-fsf/xtensa-modules.c +++ b/target/xtensa/core-fsf/xtensa-modules.c @@ -18,7 +18,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <xtensa-isa.h> +#include "qemu/osdep.h" +#include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/core-sample_controller/xtensa-modules.c b/target/xtensa/core-sample_controller/xtensa-modules.c index 2f00019..fba41b9 100644 --- a/target/xtensa/core-sample_controller/xtensa-modules.c +++ b/target/xtensa/core-sample_controller/xtensa-modules.c @@ -21,7 +21,8 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <xtensa-isa.h> +#include "qemu/osdep.h" +#include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/xtensa-isa.c b/target/xtensa/xtensa-isa.c index e0076a6..630b4f9 100644 --- a/target/xtensa/xtensa-isa.c +++ b/target/xtensa/xtensa-isa.c @@ -22,9 +22,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" diff --git a/target/xtensa/xtensa-isa.h b/target/xtensa/xtensa-isa.h index d06614c..0f0211f 100644 --- a/target/xtensa/xtensa-isa.h +++ b/target/xtensa/xtensa-isa.h @@ -1 +1 @@ -#include <hw/xtensa/xtensa-isa.h> +#include "hw/xtensa/xtensa-isa.h" diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 3934e62..7aa5af4 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -31,6 +31,7 @@ #include "libqos/pci-pc.h" #include "qemu-common.h" +#include "qapi/qmp/qdict.h" #include "qemu/host-utils.h" #include "hw/pci/pci_ids.h" diff --git a/tests/check-qdict.c b/tests/check-qdict.c index 3540577..ec628f3 100644 --- a/tests/check-qdict.c +++ b/tests/check-qdict.c @@ -9,9 +9,11 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ -#include "qemu/osdep.h" +#include "qemu/osdep.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/error.h" #include "qemu-common.h" diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 5922793..a18ea47 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -14,9 +14,12 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlit.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu-common.h" static void escaped_string(void) diff --git a/tests/check-qlist.c b/tests/check-qlist.c index 894e991..259980d 100644 --- a/tests/check-qlist.c +++ b/tests/check-qlist.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qlist.h" diff --git a/tests/check-qlit.c b/tests/check-qlit.c index c59ec1a..5d0f65b 100644 --- a/tests/check-qlit.c +++ b/tests/check-qlit.c @@ -9,10 +9,9 @@ #include "qemu/osdep.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qlit.h" -#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" static QLitObject qlit = QLIT_QDICT(((QLitDictEntry[]) { diff --git a/tests/check-qnum.c b/tests/check-qnum.c index d702d5d..2b667f7 100644 --- a/tests/check-qnum.c +++ b/tests/check-qnum.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" #include "qapi/qmp/qnum.h" -#include "qapi/error.h" #include "qemu-common.h" /* diff --git a/tests/check-qobject.c b/tests/check-qobject.c index 710f9e6..7a36706 100644 --- a/tests/check-qobject.c +++ b/tests/check-qobject.c @@ -6,9 +6,14 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ -#include "qemu/osdep.h" -#include "qapi/qmp/types.h" +#include "qemu/osdep.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu-common.h" #include <math.h> diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c index 05d82f7..8b5ab1f 100644 --- a/tests/cpu-plug-test.c +++ b/tests/cpu-plug-test.c @@ -11,7 +11,7 @@ #include "qemu-common.h" #include "libqtest.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qdict.h" struct PlugTestData { char *machine; diff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c index f7162c0..b80058f 100644 --- a/tests/device-introspect-test.c +++ b/tests/device-introspect-test.c @@ -20,8 +20,8 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "libqtest.h" const char common_args[] = "-nodefaults -machine none"; diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index c9ac997..313030a 100644 --- a/tests/drive_del-test.c +++ b/tests/drive_del-test.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "libqos/virtio.h" +#include "qapi/qmp/qdict.h" static void drive_add(void) { diff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c index 5430e13..ab988ef 100644 --- a/tests/io-channel-helpers.c +++ b/tests/io-channel-helpers.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "io-channel-helpers.h" -#include "qapi/error.h" #include "qemu/iov.h" struct QIOChannelTest { diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c index 991bc1a..306d4c0 100644 --- a/tests/libqos/libqos.c +++ b/tests/libqos/libqos.c @@ -4,6 +4,7 @@ #include "libqtest.h" #include "libqos/libqos.h" #include "libqos/pci.h" +#include "qapi/qmp/qdict.h" /*** Test Setup & Teardown ***/ diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c index ded1c54..cd4e20e 100644 --- a/tests/libqos/pci-pc.c +++ b/tests/libqos/pci-pc.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "libqos/pci-pc.h" - +#include "qapi/qmp/qdict.h" #include "hw/pci/pci_regs.h" #include "qemu-common.h" diff --git a/tests/libqtest.c b/tests/libqtest.c index 0ec8af2..f2c2853 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -12,8 +12,8 @@ * * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. - * */ + #include "qemu/osdep.h" #include "libqtest.h" @@ -24,7 +24,10 @@ #include "qapi/error.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qstring.h" #define MAX_IRQ 256 #define SOCKET_TIMEOUT 50 diff --git a/tests/libqtest.h b/tests/libqtest.h index fe7847c..8111694 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -17,8 +17,6 @@ #ifndef LIBQTEST_H #define LIBQTEST_H -#include "qapi/qmp/qdict.h" - typedef struct QTestState QTestState; extern QTestState *global_qtest; diff --git a/tests/migration-test.c b/tests/migration-test.c index 9efad95..d0abad4 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" #include "qemu/option.h" #include "qemu/range.h" #include "qemu/sockets.h" diff --git a/tests/migration/stress.c b/tests/migration/stress.c index cf8ce8b..49a03aa 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -17,21 +17,13 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdio.h> +#include "qemu/osdep.h" #include <getopt.h> -#include <string.h> -#include <stdlib.h> -#include <errno.h> -#include <unistd.h> #include <sys/reboot.h> #include <sys/syscall.h> #include <linux/random.h> -#include <sys/time.h> #include <pthread.h> -#include <fcntl.h> #include <sys/mount.h> -#include <sys/stat.h> -#include <sys/mman.h> const char *argv0; diff --git a/tests/numa-test.c b/tests/numa-test.c index e1b6152..68aca9c 100644 --- a/tests/numa-test.c +++ b/tests/numa-test.c @@ -11,6 +11,8 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" static char *make_cli(const char *generic_cli, const char *test_cli) { diff --git a/tests/ptimer-test.c b/tests/ptimer-test.c index 5d1a2a8..4148889 100644 --- a/tests/ptimer-test.c +++ b/tests/ptimer-test.c @@ -8,9 +8,9 @@ * */ +#include "qemu/osdep.h" #include <glib/gprintf.h> -#include "qemu/osdep.h" #include "qemu/main-loop.h" #include "hw/ptimer.h" diff --git a/tests/pvpanic-test.c b/tests/pvpanic-test.c index 71ebb5c..ebdf32c 100644 --- a/tests/pvpanic-test.c +++ b/tests/pvpanic-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" static void test_panic(void) { diff --git a/tests/q35-test.c b/tests/q35-test.c index f98bed7..187d68f 100644 --- a/tests/q35-test.c +++ b/tests/q35-test.c @@ -14,6 +14,7 @@ #include "libqos/pci.h" #include "libqos/pci-pc.h" #include "hw/pci-host/q35.h" +#include "qapi/qmp/qdict.h" #define TSEG_SIZE_TEST_GUEST_RAM_MBYTES 128 diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 36feb22..908f9b9 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -14,6 +14,8 @@ #include "libqtest.h" #include "qapi-visit.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qobject-input-visitor.h" #include "qapi/util.h" #include "qapi/visitor.h" diff --git a/tests/qom-test.c b/tests/qom-test.c index ab0595d..9dab7ac 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -10,9 +10,10 @@ #include "qemu/osdep.h" #include "qemu-common.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qemu/cutils.h" #include "libqtest.h" -#include "qapi/qmp/types.h" static const char *blacklist_x86[] = { "xenfv", "xenpv", NULL diff --git a/tests/tco-test.c b/tests/tco-test.c index 2616d33..8ab43d7 100644 --- a/tests/tco-test.c +++ b/tests/tco-test.c @@ -6,11 +6,13 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "libqtest.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" +#include "qapi/qmp/qdict.h" #include "hw/pci/pci_regs.h" #include "hw/i386/ich9.h" #include "hw/acpi/ich9.h" diff --git a/tests/test-aio-multithread.c b/tests/test-aio-multithread.c index c8bec81..6440d54 100644 --- a/tests/test-aio-multithread.c +++ b/tests/test-aio-multithread.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "block/aio.h" -#include "qapi/error.h" #include "qemu/coroutine.h" #include "qemu/thread.h" #include "qemu/error-report.h" diff --git a/tests/test-char.c b/tests/test-char.c index 911e3f6..b358620 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -1,13 +1,14 @@ #include "qemu/osdep.h" #include <glib/gstdio.h> -#include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "chardev/char-fe.h" #include "chardev/char-mux.h" #include "sysemu/sysemu.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qom/qom-qobject.h" #include "qmp-commands.h" diff --git a/tests/test-clone-visitor.c b/tests/test-clone-visitor.c index ac6afc5..9aeaf86 100644 --- a/tests/test-clone-visitor.c +++ b/tests/test-clone-visitor.c @@ -11,9 +11,7 @@ #include "qemu-common.h" #include "qapi/clone-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" static void test_clone_struct(void) { diff --git a/tests/test-keyval.c b/tests/test-keyval.c index baf7e33..94eb4df 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -12,6 +12,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h" diff --git a/tests/test-netfilter.c b/tests/test-netfilter.c index 2506473..95f7839 100644 --- a/tests/test-netfilter.c +++ b/tests/test-netfilter.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" /* add a netfilter to a netdev and then remove it */ static void add_one_netfilter(void) diff --git a/tests/test-qapi-util.c b/tests/test-qapi-util.c index 4b5e4f8..847f305 100644 --- a/tests/test-qapi-util.c +++ b/tests/test-qapi-util.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "test-qapi-types.h" static void test_qapi_enum_parse(void) { diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index cc1bb1a..5d5a3da 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -9,7 +9,9 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/config-file.h" diff --git a/tests/test-qga.c b/tests/test-qga.c index fd6bc76..5c5b661 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -5,6 +5,8 @@ #include <sys/un.h> #include "libqtest.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" typedef struct { char *test_dir; diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index 904c89d..24660d0 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -1,8 +1,10 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "test-qmp-commands.h" -#include "qapi/qmp/dispatch.h" +#include "qapi/error.h" #include "qemu/module.h" #include "qapi/qobject-input-visitor.h" #include "tests/test-qapi-types.h" diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index 9fb3c5e..8012341 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -14,11 +14,13 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "test-qapi-event.h" -#include "qapi/qmp/types.h" -#include "qapi/qmp/qobject.h" +#include "qapi/error.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp-event.h" typedef struct TestEventData { diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-visitor.c index fe59181..3900be2 100644 --- a/tests/test-qobject-input-visitor.c +++ b/tests/test-qobject-input-visitor.c @@ -16,9 +16,12 @@ #include "qemu-common.h" #include "qapi/error.h" #include "qapi/qobject-input-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "test-qmp-introspect.h" #include "qmp-introspect.h" diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c index d375100..3cf9424 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -15,10 +15,13 @@ #include "qemu-common.h" #include "qapi/error.h" #include "qapi/qobject-output-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" typedef struct TestOutputVisitorData { Visitor *ov; diff --git a/tests/test-replication.c b/tests/test-replication.c index cebeb79..68c0d04 100644 --- a/tests/test-replication.c +++ b/tests/test-replication.c @@ -11,6 +11,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" +#include "qemu/option.h" #include "replication.h" #include "block/block_int.h" #include "sysemu/block-backend.h" diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c index 4f9c36b..88e0e1a 100644 --- a/tests/test-string-input-visitor.c +++ b/tests/test-string-input-visitor.c @@ -15,9 +15,7 @@ #include "qemu-common.h" #include "qapi/error.h" #include "qapi/string-input-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" typedef struct TestInputVisitorData { Visitor *v; diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c index 385cddb..fa4b4ca 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -15,9 +15,7 @@ #include "qemu-common.h" #include "qapi/error.h" #include "qapi/string-output-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" typedef struct TestOutputVisitorData { Visitor *ov; diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c index 4d47cee..dd7e51d 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -15,16 +15,14 @@ #include <float.h> #include "qemu-common.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qapi/dealloc-visitor.h" diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c index 58a2dd9..495dd1e 100644 --- a/tests/test-x86-cpuid-compat.c +++ b/tests/test-x86-cpuid-compat.c @@ -1,7 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/error.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qbool.h" #include "libqtest.h" diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c index a7940a4..e9a3cb7 100644 --- a/tests/tmp105-test.c +++ b/tests/tmp105-test.c @@ -11,6 +11,7 @@ #include "libqtest.h" #include "libqos/i2c.h" +#include "qapi/qmp/qdict.h" #include "hw/misc/tmp105_regs.h" #define OMAP2_I2C_1_BASE 0x48070000 diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 95eb449..128fce3 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -12,6 +12,7 @@ #include "libqtest.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/range.h" diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index ea634dc..4114839 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -16,6 +16,7 @@ #include "libqos/libqos-spapr.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" +#include "qapi/qmp/qdict.h" #include "qemu/bswap.h" #include "hw/virtio/virtio-net.h" #include "standard-headers/linux/virtio_ids.h" diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c index 68ff954..7190e68 100644 --- a/tests/vmgenid-test.c +++ b/tests/vmgenid-test.c @@ -15,6 +15,7 @@ #include "boot-sector.h" #include "acpi-utils.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" #define VGID_GUID "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87" #define VMGENID_GUID_OFFSET 40 /* allow space for diff --git a/tests/wdt_ib700-test.c b/tests/wdt_ib700-test.c index 49f4f0c..6062d4e 100644 --- a/tests/wdt_ib700-test.c +++ b/tests/wdt_ib700-test.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" #include "qemu/timer.h" static void qmp_check_no_event(void) @@ -11,8 +11,10 @@ * * Based on net.c */ + #include "qemu/osdep.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "sysemu/tpm_backend.h" #include "sysemu/tpm.h" diff --git a/trace/control-internal.h b/trace/control-internal.h index a9d395a..c7fbe2d 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -10,8 +10,6 @@ #ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H -#include <stddef.h> /* size_t */ - #include "qom/cpu.h" diff --git a/trace/control.c b/trace/control.c index 2769934..e40cfca 100644 --- a/trace/control.c +++ b/trace/control.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "trace/control.h" #include "qemu/help_option.h" +#include "qemu/option.h" #ifdef CONFIG_TRACE_SIMPLE #include "trace/simple.h" #endif diff --git a/trace/qmp.c b/trace/qmp.c index ac777d1..ccd35cd 100644 --- a/trace/qmp.c +++ b/trace/qmp.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qmp-commands.h" #include "trace/control.h" diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 9919588..ced7d91 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -15,6 +15,7 @@ common-obj-$(CONFIG_SDL) += sdl.mo common-obj-$(CONFIG_COCOA) += cocoa.o common-obj-$(CONFIG_CURSES) += curses.o common-obj-$(CONFIG_VNC) += $(vnc-obj-y) +common-obj-$(call lnot,$(CONFIG_VNC)) += vnc-stubs.o common-obj-$(CONFIG_GTK) += gtk.o common-obj-$(if $(CONFIG_WIN32),n,$(if $(CONFIG_SDL),y,$(CONFIG_GTK))) += x_keymap.o @@ -31,6 +31,7 @@ #include "ui/console.h" #include "ui/input.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qmp-commands.h" #include "sysemu/blockdev.h" #include "qemu-version.h" diff --git a/ui/console.c b/ui/console.c index c4c95ab..36584d0 100644 --- a/ui/console.c +++ b/ui/console.c @@ -21,10 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" -#include "qemu-common.h" #include "ui/console.h" #include "hw/qdev-core.h" +#include "qapi/error.h" +#include "qemu/option.h" #include "qemu/timer.h" #include "qmp-commands.h" #include "chardev/char-fe.h" @@ -36,6 +36,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "ui/console.h" diff --git a/ui/input-legacy.c b/ui/input-legacy.c index c75aba1..92b37cc 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -26,7 +26,6 @@ #include "sysemu/sysemu.h" #include "ui/console.h" #include "qmp-commands.h" -#include "qapi-types.h" #include "ui/keymaps.h" #include "ui/input.h" @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "qapi-types.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qemu/error-report.h" #include "qmp-commands.h" #include "trace.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index 2baf0c7..e449172 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -21,7 +21,6 @@ #include <netdb.h> #include "sysemu/sysemu.h" -#include "qemu-common.h" #include "ui/qemu-spice.h" #include "qemu/error-report.h" #include "qemu/thread.h" @@ -30,10 +29,9 @@ #include "qemu-x509.h" #include "qemu/sockets.h" #include "qmp-commands.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qjson.h" +#include "qapi/error.h" #include "qemu/notify.h" +#include "qemu/option.h" #include "migration/misc.h" #include "hw/hw.h" #include "ui/spice-display.h" diff --git a/ui/spice-display.c b/ui/spice-display.c index efe9c57..98ccdfb 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -16,9 +16,9 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "ui/qemu-spice.h" #include "qemu/timer.h" +#include "qemu/option.h" #include "qemu/queue.h" #include "ui/console.h" #include "sysemu/sysemu.h" diff --git a/ui/vnc-palette.h b/ui/vnc-palette.h index 1bd4318..e9f0eaf 100644 --- a/ui/vnc-palette.h +++ b/ui/vnc-palette.h @@ -29,7 +29,6 @@ #ifndef VNC_PALETTE_H #define VNC_PALETTE_H -#include "qapi/qmp/qlist.h" #include "qemu/queue.h" #define VNC_PALETTE_HASH_SIZE 256 diff --git a/ui/vnc-stubs.c b/ui/vnc-stubs.c new file mode 100644 index 0000000..f512805 --- /dev/null +++ b/ui/vnc-stubs.c @@ -0,0 +1,21 @@ +#include "qemu/osdep.h" +#include "ui/console.h" + +int vnc_display_password(const char *id, const char *password) +{ + return -ENODEV; +} +int vnc_display_pw_expire(const char *id, time_t expires) +{ + return -ENODEV; +}; +QemuOpts *vnc_parse(const char *str, Error **errp) +{ + error_setg(errp, "VNC support is disabled"); + return NULL; +} +int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp) +{ + error_setg(errp, "VNC support is disabled"); + return -1; +} @@ -30,12 +30,12 @@ #include "trace.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "qemu/timer.h" #include "qemu/acl.h" #include "qemu/config-file.h" -#include "qapi/qmp/qerror.h" -#include "qapi/qmp/types.h" +#include "qapi/error.h" #include "qmp-commands.h" #include "ui/input.h" #include "qapi-event.h" @@ -43,7 +43,6 @@ #include "keymaps.h" #include "vnc-palette.h" #include "vnc-enc-zrle.h" -#include "qapi-types.h" // #define _VNC_DEBUG 1 diff --git a/util/keyval.c b/util/keyval.c index 7dfc75c..212ae90 100644 --- a/util/keyval.c +++ b/util/keyval.c @@ -81,6 +81,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/option.h" diff --git a/util/qemu-config.c b/util/qemu-config.c index 029fec5..10cae12 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -1,4 +1,7 @@ #include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/option.h" diff --git a/util/qemu-option.c b/util/qemu-option.c index 553d3dc..a401e93 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -28,7 +28,10 @@ #include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qerror.h" #include "qemu/option_int.h" #include "qemu/cutils.h" @@ -21,15 +21,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu-version.h" #include "qemu/cutils.h" #include "qemu/help_option.h" #include "qemu/uuid.h" #ifdef CONFIG_SECCOMP +#include <sys/prctl.h> #include "sysemu/seccomp.h" -#include "sys/prctl.h" #endif #ifdef CONFIG_SDL @@ -96,7 +98,6 @@ int main(int argc, char **argv) #include "sysemu/hax.h" #include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" -#include "qapi/qmp/qjson.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu-options.h" |