Skip to content

Commit 650d103

Browse files
author
Markus Armbruster
committed
Include hw/hw.h exactly where needed
In my "build everything" tree, changing hw/hw.h triggers a recompile of some 2600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). The previous commits have left only the declaration of hw_error() in hw/hw.h. This permits dropping most of its inclusions. Touching it now recompiles less than 200 objects. Signed-off-by: Markus Armbruster <[email protected]> Reviewed-by: Alistair Francis <[email protected]> Message-Id: <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Tested-by: Philippe Mathieu-Daudé <[email protected]>
1 parent e7febd9 commit 650d103

File tree

401 files changed

+27
-374
lines changed

Some content is hidden

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

401 files changed

+27
-374
lines changed

‎accel/kvm/kvm-all.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "qemu/config-file.h"
2424
#include "qemu/error-report.h"
2525
#include "qapi/error.h"
26-
#include "hw/hw.h"
2726
#include "hw/pci/msi.h"
2827
#include "hw/pci/msix.h"
2928
#include "hw/s390x/adapter.h"

‎audio/audio.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
#include "qemu/osdep.h"
26-
#include "hw/hw.h"
2726
#include "audio.h"
2827
#include "migration/vmstate.h"
2928
#include "monitor/monitor.h"

‎audio/spiceaudio.c

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919

2020
#include "qemu/osdep.h"
21-
#include "hw/hw.h"
2221
#include "qemu/host-utils.h"
2322
#include "qemu/module.h"
2423
#include "qemu/error-report.h"

‎audio/wavcapture.c

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "qemu/osdep.h"
2-
#include "hw/hw.h"
32
#include "monitor/monitor.h"
43
#include "qapi/error.h"
54
#include "qemu/error-report.h"

‎cpus.c

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
#include "hw/nmi.h"
5757
#include "sysemu/replay.h"
5858
#include "hw/boards.h"
59+
#include "hw/hw.h"
5960

6061
#ifdef CONFIG_LINUX
6162

‎device-hotplug.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
#include "qemu/osdep.h"
26-
#include "hw/hw.h"
2726
#include "hw/boards.h"
2827
#include "sysemu/block-backend.h"
2928
#include "sysemu/blockdev.h"

‎exec.c

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#if defined(CONFIG_USER_ONLY)
4343
#include "qemu.h"
4444
#else /* !CONFIG_USER_ONLY */
45-
#include "hw/hw.h"
4645
#include "exec/memory.h"
4746
#include "exec/ioport.h"
4847
#include "sysemu/dma.h"

‎hw/9pfs/xen-9p-backend.c

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include "qemu/osdep.h"
1212

13-
#include "hw/hw.h"
1413
#include "hw/9pfs/9p.h"
1514
#include "hw/xen/xen-legacy-backend.h"
1615
#include "hw/9pfs/xen-9pfs.h"

‎hw/acpi/core.c

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
#include "qemu/osdep.h"
2323
#include "sysemu/sysemu.h"
24-
#include "hw/hw.h"
2524
#include "hw/irq.h"
2625
#include "hw/acpi/acpi.h"
2726
#include "hw/nvram/fw_cfg.h"

‎hw/acpi/cpu_hotplug.c

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
* See the COPYING file in the top-level directory.
1111
*/
1212
#include "qemu/osdep.h"
13-
#include "hw/hw.h"
1413
#include "hw/acpi/cpu_hotplug.h"
1514
#include "qapi/error.h"
1615
#include "qom/cpu.h"

‎hw/acpi/ich9.c

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
*/
2626

2727
#include "qemu/osdep.h"
28-
#include "hw/hw.h"
2928
#include "qapi/error.h"
3029
#include "qapi/visitor.h"
3130
#include "hw/i386/pc.h"

‎hw/acpi/pcihp.c

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "qemu/osdep.h"
2828
#include "hw/acpi/pcihp.h"
2929

30-
#include "hw/hw.h"
3130
#include "hw/i386/pc.h"
3231
#include "hw/pci/pci.h"
3332
#include "hw/pci/pci_bridge.h"

‎hw/acpi/piix4.c

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*/
2121

2222
#include "qemu/osdep.h"
23-
#include "hw/hw.h"
2423
#include "hw/i386/pc.h"
2524
#include "hw/irq.h"
2625
#include "hw/isa/apm.h"

‎hw/adc/stm32f2xx_adc.c

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "qemu/osdep.h"
2626
#include "hw/sysbus.h"
2727
#include "migration/vmstate.h"
28-
#include "hw/hw.h"
2928
#include "qemu/log.h"
3029
#include "qemu/module.h"
3130
#include "hw/adc/stm32f2xx_adc.h"

‎hw/alpha/dp264.c

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "qemu/osdep.h"
1010
#include "qemu-common.h"
1111
#include "cpu.h"
12-
#include "hw/hw.h"
1312
#include "elf.h"
1413
#include "hw/loader.h"
1514
#include "hw/boards.h"

‎hw/alpha/typhoon.c

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "qemu/units.h"
1212
#include "qapi/error.h"
1313
#include "cpu.h"
14-
#include "hw/hw.h"
1514
#include "hw/irq.h"
1615
#include "sysemu/sysemu.h"
1716
#include "alpha_sys.h"

‎hw/arm/boot.c

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "qemu/error-report.h"
1313
#include "qapi/error.h"
1414
#include <libfdt.h>
15-
#include "hw/hw.h"
1615
#include "hw/arm/boot.h"
1716
#include "hw/arm/linux-boot-if.h"
1817
#include "sysemu/kvm.h"

‎hw/arm/collie.c

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*/
1111
#include "qemu/osdep.h"
1212
#include "qemu/units.h"
13-
#include "hw/hw.h"
1413
#include "hw/sysbus.h"
1514
#include "hw/boards.h"
1615
#include "strongarm.h"

‎hw/arm/gumstix.c

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
#include "qemu/osdep.h"
3838
#include "qemu/error-report.h"
39-
#include "hw/hw.h"
4039
#include "hw/arm/pxa.h"
4140
#include "net/net.h"
4241
#include "hw/block/flash.h"

‎hw/arm/integratorcp.c

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "sysemu/sysemu.h"
2222
#include "qemu/error-report.h"
2323
#include "hw/char/pl011.h"
24+
#include "hw/hw.h"
2425
#include "hw/irq.h"
2526

2627
#define TYPE_INTEGRATOR_CM "integrator_core"

‎hw/arm/mainstone.c

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "qemu/osdep.h"
1515
#include "qemu/error-report.h"
1616
#include "qapi/error.h"
17-
#include "hw/hw.h"
1817
#include "hw/arm/pxa.h"
1918
#include "hw/arm/boot.h"
2019
#include "net/net.h"

‎hw/arm/musicpal.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "sysemu/sysemu.h"
2020
#include "hw/boards.h"
2121
#include "hw/char/serial.h"
22+
#include "hw/hw.h"
2223
#include "qemu/timer.h"
2324
#include "hw/ptimer.h"
2425
#include "hw/block/flash.h"

‎hw/arm/omap2.c

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "sysemu/qtest.h"
2626
#include "sysemu/reset.h"
2727
#include "hw/boards.h"
28-
#include "hw/hw.h"
2928
#include "hw/irq.h"
3029
#include "hw/arm/boot.h"
3130
#include "hw/arm/omap.h"

‎hw/arm/omap_sx1.c

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
*/
2828
#include "qemu/osdep.h"
2929
#include "qapi/error.h"
30-
#include "hw/hw.h"
3130
#include "ui/console.h"
3231
#include "hw/arm/omap.h"
3332
#include "hw/boards.h"

‎hw/arm/palm.c

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include "qemu/osdep.h"
2121
#include "qapi/error.h"
22-
#include "hw/hw.h"
2322
#include "audio/audio.h"
2423
#include "sysemu/sysemu.h"
2524
#include "sysemu/qtest.h"

‎hw/arm/pxa2xx_pic.c

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "qemu/osdep.h"
1212
#include "qemu/module.h"
1313
#include "cpu.h"
14-
#include "hw/hw.h"
1514
#include "hw/arm/pxa.h"
1615
#include "hw/sysbus.h"
1716
#include "migration/vmstate.h"

‎hw/arm/spitz.c

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include "qemu/osdep.h"
1414
#include "qapi/error.h"
15-
#include "hw/hw.h"
1615
#include "hw/arm/pxa.h"
1716
#include "hw/arm/boot.h"
1817
#include "sysemu/sysemu.h"

‎hw/arm/tosa.c

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include "qemu/osdep.h"
1515
#include "qapi/error.h"
16-
#include "hw/hw.h"
1716
#include "hw/arm/pxa.h"
1817
#include "hw/arm/boot.h"
1918
#include "hw/arm/sharpsl.h"

‎hw/arm/virt-acpi-build.c

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "hw/acpi/acpi.h"
3737
#include "hw/nvram/fw_cfg.h"
3838
#include "hw/acpi/bios-linker-loader.h"
39-
#include "hw/hw.h"
4039
#include "hw/acpi/aml-build.h"
4140
#include "hw/acpi/utils.h"
4241
#include "hw/acpi/pci.h"

‎hw/arm/z2.c

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313

1414
#include "qemu/osdep.h"
15-
#include "hw/hw.h"
1615
#include "hw/arm/pxa.h"
1716
#include "hw/arm/boot.h"
1817
#include "hw/i2c/i2c.h"

‎hw/audio/ac97.c

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919

2020
#include "qemu/osdep.h"
21-
#include "hw/hw.h"
2221
#include "hw/audio/soundhw.h"
2322
#include "audio/audio.h"
2423
#include "hw/pci/pci.h"

‎hw/audio/adlib.c

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "qemu/osdep.h"
2626
#include "qapi/error.h"
2727
#include "qemu/module.h"
28-
#include "hw/hw.h"
2928
#include "hw/audio/soundhw.h"
3029
#include "audio/audio.h"
3130
#include "hw/isa/isa.h"

‎hw/audio/cs4231a.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
#include "qemu/osdep.h"
26-
#include "hw/hw.h"
2726
#include "hw/audio/soundhw.h"
2827
#include "audio/audio.h"
2928
#include "hw/irq.h"

‎hw/audio/es1370.c

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#define SILENT_ES1370
2828

2929
#include "qemu/osdep.h"
30-
#include "hw/hw.h"
3130
#include "hw/audio/soundhw.h"
3231
#include "audio/audio.h"
3332
#include "hw/pci/pci.h"

‎hw/audio/gus.c

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "qemu/osdep.h"
2626
#include "qapi/error.h"
2727
#include "qemu/module.h"
28-
#include "hw/hw.h"
2928
#include "hw/audio/soundhw.h"
3029
#include "audio/audio.h"
3130
#include "hw/irq.h"

‎hw/audio/hda-codec.c

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919

2020
#include "qemu/osdep.h"
21-
#include "hw/hw.h"
2221
#include "hw/pci/pci.h"
2322
#include "intel-hda.h"
2423
#include "migration/vmstate.h"

‎hw/audio/intel-hda.c

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919

2020
#include "qemu/osdep.h"
21-
#include "hw/hw.h"
2221
#include "hw/pci/pci.h"
2322
#include "hw/pci/msi.h"
2423
#include "qemu/timer.h"

‎hw/audio/marvell_88w8618.c

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "qemu/osdep.h"
1414
#include "hw/sysbus.h"
1515
#include "migration/vmstate.h"
16-
#include "hw/hw.h"
1716
#include "hw/irq.h"
1817
#include "hw/audio/wm8750.h"
1918
#include "audio/audio.h"

‎hw/audio/milkymist-ac97.c

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
*/
2323

2424
#include "qemu/osdep.h"
25-
#include "hw/hw.h"
2625
#include "hw/irq.h"
2726
#include "hw/sysbus.h"
2827
#include "migration/vmstate.h"

‎hw/audio/pcspk.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
#include "qemu/osdep.h"
26-
#include "hw/hw.h"
2726
#include "hw/isa/isa.h"
2827
#include "hw/audio/soundhw.h"
2928
#include "audio/audio.h"

‎hw/audio/sb16.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
#include "qemu/osdep.h"
26-
#include "hw/hw.h"
2726
#include "hw/audio/soundhw.h"
2827
#include "audio/audio.h"
2928
#include "hw/irq.h"

‎hw/block/dataplane/xen-block.c

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "qemu/osdep.h"
2222
#include "qemu/error-report.h"
2323
#include "qapi/error.h"
24-
#include "hw/hw.h"
2524
#include "hw/xen/xen_common.h"
2625
#include "hw/block/xen_blkif.h"
2726
#include "sysemu/block-backend.h"

‎hw/block/ecc.c

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313

1414
#include "qemu/osdep.h"
15-
#include "hw/hw.h"
1615
#include "migration/vmstate.h"
1716
#include "hw/block/flash.h"
1817

‎hw/block/fdc.c

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
*/
2929

3030
#include "qemu/osdep.h"
31-
#include "hw/hw.h"
3231
#include "hw/block/fdc.h"
3332
#include "qapi/error.h"
3433
#include "qemu/error-report.h"

‎hw/block/m25p80.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include "qemu/osdep.h"
2525
#include "qemu/units.h"
26-
#include "hw/hw.h"
2726
#include "sysemu/block-backend.h"
2827
#include "hw/ssi/ssi.h"
2928
#include "migration/vmstate.h"

‎hw/block/nvme.c

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "qemu/osdep.h"
2929
#include "qemu/units.h"
3030
#include "hw/block/block.h"
31-
#include "hw/hw.h"
3231
#include "hw/pci/msix.h"
3332
#include "hw/pci/pci.h"
3433
#include "migration/vmstate.h"

‎hw/block/pflash_cfi01.c

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
*/
3838

3939
#include "qemu/osdep.h"
40-
#include "hw/hw.h"
4140
#include "hw/block/block.h"
4241
#include "hw/block/flash.h"
4342
#include "sysemu/block-backend.h"

‎hw/block/pflash_cfi02.c

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
*/
3434

3535
#include "qemu/osdep.h"
36-
#include "hw/hw.h"
3736
#include "hw/block/block.h"
3837
#include "hw/block/flash.h"
3938
#include "qapi/error.h"

‎hw/block/tc58128.c

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "qemu/osdep.h"
22
#include "qemu/units.h"
3-
#include "hw/hw.h"
43
#include "hw/sh4/sh.h"
54
#include "hw/loader.h"
65
#include "sysemu/qtest.h"

‎hw/block/xen-block.c

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "qapi/visitor.h"
1818
#include "qapi/qmp/qdict.h"
1919
#include "qapi/qmp/qstring.h"
20-
#include "hw/hw.h"
2120
#include "hw/xen/xen_common.h"
2221
#include "hw/block/xen_blkif.h"
2322
#include "hw/xen/xen-block.h"

0 commit comments

Comments
 (0)