Commit d5938f29 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

Clean up inclusion of sysemu/sysemu.h 



In my "build everything" tree, changing sysemu/sysemu.h triggers a
recompile of some 5400 out of 6600 objects (not counting tests and
objects that don't depend on qemu/osdep.h).

Almost a third of its inclusions are actually superfluous.  Delete
them.  Downgrade two more to qapi/qapi-types-run-state.h, and move one
from char/serial.h to char/serial.c.

hw/semihosting/config.c, monitor/monitor.c, qdev-monitor.c, and
stubs/semihost.c define variables declared in sysemu/sysemu.h without
including it.  The compiler is cool with that, but include it anyway.

This doesn't reduce actual use much, as it's still included into
widely included headers.  The next commit will tackle that.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-Id: <20190812052359.30071-27-armbru@redhat.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent b58c5c2d

accel/tcg/tcg-all.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#include "qemu/osdep.h"

#include "sysemu/accel.h"

#include "sysemu/sysemu.h"

#include "sysemu/tcg.h"

#include "qom/object.h"

#include "cpu.h"

block/nfs.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "qemu/option.h"

#include "qemu/uri.h"

#include "qemu/cutils.h"

#include "sysemu/sysemu.h"

#include "qapi/qapi-visit-block-core.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qstring.h"

blockdev-nbd.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "hw/block/block.h"

#include "qapi/error.h"

#include "qapi/qapi-commands-block.h"

#include "sysemu/sysemu.h"

#include "block/nbd.h"

#include "io/channel-socket.h"

#include "io/net-listener.h"

dump/win_dump.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "monitor/monitor.h"

#include "sysemu/kvm.h"

#include "sysemu/dump.h"

#include "sysemu/sysemu.h"

#include "sysemu/memory_mapping.h"

#include "sysemu/cpus.h"

#include "qapi/error.h"

hw/acpi/pcihp.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "hw/pci/pci.h"

#include "hw/pci/pci_bridge.h"

#include "hw/acpi/acpi.h"

#include "sysemu/sysemu.h"

#include "exec/address-spaces.h"

#include "hw/pci/pci_bus.h"

#include "migration/vmstate.h"