From 650d103d3ea959212f826acb9d3fe80cf30e347b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Aug 2019 07:23:48 +0200 Subject: Include hw/hw.h exactly where needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Alistair Francis Message-Id: <20190812052359.30071-19-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- hw/display/ati.c | 1 - hw/display/bcm2835_fb.c | 1 + hw/display/bochs-display.c | 1 - hw/display/cirrus_vga.c | 1 - hw/display/cirrus_vga_isa.c | 1 - hw/display/exynos4210_fimd.c | 1 + hw/display/framebuffer.c | 1 - hw/display/milkymist-tmu2.c | 1 - hw/display/omap_lcdc.c | 1 - hw/display/qxl.h | 1 - hw/display/sm501.c | 1 - hw/display/tc6393xb.c | 1 - hw/display/vga-isa-mm.c | 1 - hw/display/vga-isa.c | 1 - hw/display/vga-pci.c | 1 - hw/display/vga.c | 1 - hw/display/virtio-vga.c | 1 - hw/display/vmware_vga.c | 1 - hw/display/xenfb.c | 1 - 19 files changed, 2 insertions(+), 17 deletions(-) (limited to 'hw/display') diff --git a/hw/display/ati.c b/hw/display/ati.c index a747c4cc98..df978a420d 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -24,7 +24,6 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "ui/console.h" #include "hw/display/i2c-ddc.h" #include "trace.h" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index 3d99d99e2b..e606893f28 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/display/bcm2835_fb.h" +#include "hw/hw.h" #include "hw/irq.h" #include "framebuffer.h" #include "ui/pixel_ops.h" diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index 3acc1d5967..1ddba5b16f 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "hw/display/bochs-vbe.h" diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 3120b3cfaf..0f5465bc14 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -38,7 +38,6 @@ #include "sysemu/reset.h" #include "qapi/error.h" #include "trace.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "ui/pixel_ops.h" diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c index 69cdb9e066..49f409b638 100644 --- a/hw/display/cirrus_vga_isa.c +++ b/hw/display/cirrus_vga_isa.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/loader.h" #include "hw/isa/isa.h" #include "cirrus_vga_internal.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 8e1508a3e6..c1071ecd46 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/display/framebuffer.c b/hw/display/framebuffer.c index 36e3db189a..4485aa335b 100644 --- a/hw/display/framebuffer.c +++ b/hw/display/framebuffer.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "ui/console.h" #include "framebuffer.h" diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index 7bfffa52da..199f1227e7 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index b00ce04b3b..6ad13f2e9e 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "ui/console.h" #include "hw/arm/omap.h" diff --git a/hw/display/qxl.h b/hw/display/qxl.h index 4adfdb1e5d..80eb0d2672 100644 --- a/hw/display/qxl.h +++ b/hw/display/qxl.h @@ -2,7 +2,6 @@ #define HW_QXL_H -#include "hw/hw.h" #include "hw/pci/pci.h" #include "vga_int.h" #include "qemu/thread.h" diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 6f88aaaa08..603396358d 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -29,7 +29,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/char/serial.h" #include "ui/console.h" #include "hw/sysbus.h" diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c index 74a77eb43b..49a676d1b0 100644 --- a/hw/display/tc6393xb.c +++ b/hw/display/tc6393xb.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/host-utils.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/display/tc6393xb.h" #include "exec/memory.h" diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index 1c4f43b52b..e9c43e5530 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" #include "qemu/units.h" -#include "hw/hw.h" #include "migration/vmstate.h" #include "hw/display/vga.h" #include "vga_int.h" diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 945952a9b0..189a4afc15 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "vga_int.h" #include "ui/pixel_ops.h" diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index cb956b4545..86299f5e97 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "vga_int.h" diff --git a/hw/display/vga.c b/hw/display/vga.c index f8098f63e9..573d223d46 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -26,7 +26,6 @@ #include "qemu/units.h" #include "sysemu/reset.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/display/vga.h" #include "hw/pci/pci.h" #include "vga_int.h" diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 79a145e284..e5227fac28 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/virtio/virtio-gpu.h" #include "qapi/error.h" diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index ebfcc46a2d..f0b136eb16 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -26,7 +26,6 @@ #include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/loader.h" #include "trace.h" #include "ui/vnc.h" diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 3c79913b31..838260b6ad 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "ui/input.h" #include "ui/console.h" #include "hw/xen/xen-legacy-backend.h" -- cgit v1.2.3