Skip to content

Commit 54d3123

Browse files
author
Markus Armbruster
committed
sysemu: Split sysemu/runstate.h off sysemu/sysemu.h
sysemu/sysemu.h is a rather unfocused dumping ground for stuff related to the system-emulator. Evidence: * It's included widely: in my "build everything" tree, changing sysemu/sysemu.h still triggers a recompile of some 1100 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h, down from 5400 due to the previous two commits). * It pulls in more than a dozen additional headers. Split stuff related to run state management into its own header sysemu/runstate.h. Touching sysemu/sysemu.h now recompiles some 850 objects. qemu/uuid.h also drops from 1100 to 850, and qapi/qapi-types-run-state.h from 4400 to 4200. Touching new sysemu/runstate.h recompiles some 500 objects. Since I'm touching MAINTAINERS to add sysemu/runstate.h anyway, also add qemu/main-loop.h. Suggested-by: Paolo Bonzini <[email protected]> Signed-off-by: Markus Armbruster <[email protected]> Message-Id: <[email protected]> Reviewed-by: Alex Bennée <[email protected]> [Unbreak OS-X build]
1 parent 2f780b6 commit 54d3123

File tree

143 files changed

+216
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+216
-143
lines changed

MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,6 +1924,8 @@ Main loop
19241924
M: Paolo Bonzini <[email protected]>
19251925
S: Maintained
19261926
F: cpus.c
1927+
F: include/qemu/main-loop.h
1928+
F: include/sysemu/runstate.h
19271929
F: util/main-loop.c
19281930
F: util/qemu-timer.c
19291931
F: vl.c

accel/kvm/kvm-all.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "hw/s390x/adapter.h"
2929
#include "exec/gdbstub.h"
3030
#include "sysemu/kvm_int.h"
31+
#include "sysemu/runstate.h"
3132
#include "sysemu/cpus.h"
3233
#include "sysemu/sysemu.h"
3334
#include "qemu/bswap.h"

audio/audio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
#include "qapi/error.h"
3131
#include "qapi/qobject-input-visitor.h"
3232
#include "qapi/qapi-visit-audio.h"
33-
#include "sysemu/sysemu.h"
3433
#include "qemu/cutils.h"
3534
#include "qemu/module.h"
3635
#include "sysemu/replay.h"
36+
#include "sysemu/runstate.h"
3737
#include "trace.h"
3838

3939
#define AUDIO_CAP "audio"

block/block-backend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "block/throttle-groups.h"
1818
#include "hw/qdev-core.h"
1919
#include "sysemu/blockdev.h"
20-
#include "sysemu/sysemu.h"
20+
#include "sysemu/runstate.h"
2121
#include "qapi/error.h"
2222
#include "qapi/qapi-events-block.h"
2323
#include "qemu/id.h"

blockdev.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
#include "block/trace.h"
5959
#include "sysemu/arch_init.h"
6060
#include "sysemu/qtest.h"
61+
#include "sysemu/runstate.h"
6162
#include "qemu/cutils.h"
6263
#include "qemu/help_option.h"
6364
#include "qemu/main-loop.h"

cpus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#include "sysemu/kvm.h"
4242
#include "sysemu/hax.h"
4343
#include "sysemu/hvf.h"
44-
#include "sysemu/sysemu.h"
4544
#include "sysemu/whpx.h"
4645
#include "exec/exec-all.h"
4746

@@ -56,6 +55,7 @@
5655
#include "tcg.h"
5756
#include "hw/nmi.h"
5857
#include "sysemu/replay.h"
58+
#include "sysemu/runstate.h"
5959
#include "hw/boards.h"
6060
#include "hw/hw.h"
6161

dump/dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "monitor/monitor.h"
2121
#include "sysemu/kvm.h"
2222
#include "sysemu/dump.h"
23-
#include "sysemu/sysemu.h"
2423
#include "sysemu/memory_mapping.h"
24+
#include "sysemu/runstate.h"
2525
#include "sysemu/cpus.h"
2626
#include "qapi/error.h"
2727
#include "qapi/qapi-commands-dump.h"

gdbstub.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include "qemu/sockets.h"
4949
#include "sysemu/hw_accel.h"
5050
#include "sysemu/kvm.h"
51+
#include "sysemu/runstate.h"
5152
#include "hw/semihosting/semihost.h"
5253
#include "exec/exec-all.h"
5354

hw/acpi/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*/
2121

2222
#include "qemu/osdep.h"
23-
#include "sysemu/sysemu.h"
2423
#include "hw/irq.h"
2524
#include "hw/acpi/acpi.h"
2625
#include "hw/nvram/fw_cfg.h"
@@ -32,6 +31,7 @@
3231
#include "qemu/error-report.h"
3332
#include "qemu/module.h"
3433
#include "qemu/option.h"
34+
#include "sysemu/runstate.h"
3535

3636
struct acpi_table_header {
3737
uint16_t _length; /* our length, not actual part of the hdr */

hw/acpi/ich9.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "qemu/timer.h"
3434
#include "qom/cpu.h"
3535
#include "sysemu/reset.h"
36-
#include "sysemu/sysemu.h"
36+
#include "sysemu/runstate.h"
3737
#include "hw/acpi/acpi.h"
3838
#include "hw/acpi/tco.h"
3939
#include "exec/address-spaces.h"

0 commit comments

Comments
 (0)