From 71e8a915855857e0d45b322826778516cc3e3055 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Aug 2019 07:23:38 +0200 Subject: Include sysemu/reset.h a lot less In my "build everything" tree, changing sysemu/reset.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 main culprit is hw/hw.h, which supposedly includes it for convenience. Include sysemu/reset.h only where it's needed. Touching it now recompiles less than 200 objects. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Tested-by: Philippe Mathieu-Daudé Message-Id: <20190812052359.30071-9-armbru@redhat.com> --- hw/input/lm832x.c | 1 + hw/input/pckbd.c | 2 ++ hw/input/ps2.c | 2 ++ hw/input/tsc2005.c | 1 + hw/input/tsc210x.c | 1 + 5 files changed, 7 insertions(+) (limited to 'hw/input') diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index 5203da2bcf..ebb72c6590 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -23,6 +23,7 @@ #include "hw/i2c/i2c.h" #include "qemu/module.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "ui/console.h" #define TYPE_LM8323 "lm8323" diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 47a606f5e3..5d06a53362 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.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/log.h" #include "hw/hw.h" @@ -28,6 +29,7 @@ #include "hw/i386/pc.h" #include "hw/input/ps2.h" #include "hw/input/i8042.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/input/ps2.c b/hw/input/ps2.c index d3161f1e7c..8d922b05c9 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.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 "qemu/log.h" #include "hw/hw.h" #include "hw/input/ps2.h" #include "ui/console.h" #include "ui/input.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c index f82771e7a7..0a0431744c 100644 --- a/hw/input/tsc2005.c +++ b/hw/input/tsc2005.c @@ -22,6 +22,7 @@ #include "qemu/log.h" #include "hw/hw.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "ui/console.h" #include "hw/input/tsc2xxx.h" #include "trace.h" diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index f94cb4683b..d2486f4b4e 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -23,6 +23,7 @@ #include "hw/hw.h" #include "audio/audio.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "ui/console.h" #include "hw/arm/omap.h" /* For I2SCodec */ #include "hw/input/tsc2xxx.h" -- cgit v1.2.3-55-g7522