Message ID | f46bc751e8426f9d937c9540f2e67d2f0b2cc582.1672868854.git.balaton@eik.bme.hu |
---|---|
State | New |
Headers | show |
Series | Misc ppc/mac machines clean up | expand |
On 4/1/23 22:59, BALATON Zoltan wrote: > The header hw/input/adb.h is included by some files that don't need > it. Clean it up and include only where necessary. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > hw/misc/macio/cuda.c | 2 -- > hw/misc/macio/pmu.c | 3 --- > hw/misc/mos6522.c | 1 - > include/hw/misc/mac_via.h | 1 + > include/hw/misc/macio/cuda.h | 1 + > include/hw/misc/macio/pmu.h | 1 + > include/hw/misc/mos6522.h | 3 +-- > 7 files changed, 4 insertions(+), 8 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 04/01/2023 21:59, BALATON Zoltan wrote: > The header hw/input/adb.h is included by some files that don't need > it. Clean it up and include only where necessary. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > hw/misc/macio/cuda.c | 2 -- > hw/misc/macio/pmu.c | 3 --- > hw/misc/mos6522.c | 1 - > include/hw/misc/mac_via.h | 1 + > include/hw/misc/macio/cuda.h | 1 + > include/hw/misc/macio/pmu.h | 1 + > include/hw/misc/mos6522.h | 3 +-- > 7 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c > index 853e88bfed..7208b90e12 100644 > --- a/hw/misc/macio/cuda.c > +++ b/hw/misc/macio/cuda.c > @@ -27,8 +27,6 @@ > #include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "migration/vmstate.h" > -#include "hw/input/adb.h" > -#include "hw/misc/mos6522.h" > #include "hw/misc/macio/cuda.h" > #include "qapi/error.h" > #include "qemu/timer.h" > diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c > index 97ef8c771b..8575bc1264 100644 > --- a/hw/misc/macio/pmu.c > +++ b/hw/misc/macio/pmu.c > @@ -31,10 +31,7 @@ > #include "qemu/osdep.h" > #include "hw/qdev-properties.h" > #include "migration/vmstate.h" > -#include "hw/input/adb.h" > #include "hw/irq.h" > -#include "hw/misc/mos6522.h" > -#include "hw/misc/macio/gpio.h" > #include "hw/misc/macio/pmu.h" > #include "qapi/error.h" > #include "qemu/timer.h" > diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c > index 0ed631186c..d6ba47bde9 100644 > --- a/hw/misc/mos6522.c > +++ b/hw/misc/mos6522.c > @@ -25,7 +25,6 @@ > */ > > #include "qemu/osdep.h" > -#include "hw/input/adb.h" > #include "hw/irq.h" > #include "hw/misc/mos6522.h" > #include "hw/qdev-properties.h" > diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h > index 5fe7a7f592..422da43bf9 100644 > --- a/include/hw/misc/mac_via.h > +++ b/include/hw/misc/mac_via.h > @@ -12,6 +12,7 @@ > #include "exec/memory.h" > #include "hw/sysbus.h" > #include "hw/misc/mos6522.h" > +#include "hw/input/adb.h" > #include "qom/object.h" > > > diff --git a/include/hw/misc/macio/cuda.h b/include/hw/misc/macio/cuda.h > index a71deec968..8a6678c749 100644 > --- a/include/hw/misc/macio/cuda.h > +++ b/include/hw/misc/macio/cuda.h > @@ -26,6 +26,7 @@ > #ifndef CUDA_H > #define CUDA_H > > +#include "hw/input/adb.h" > #include "hw/misc/mos6522.h" > #include "qom/object.h" > > diff --git a/include/hw/misc/macio/pmu.h b/include/hw/misc/macio/pmu.h > index 00fcdd23f5..ba76afb52a 100644 > --- a/include/hw/misc/macio/pmu.h > +++ b/include/hw/misc/macio/pmu.h > @@ -10,6 +10,7 @@ > #ifndef PMU_H > #define PMU_H > > +#include "hw/input/adb.h" > #include "hw/misc/mos6522.h" > #include "hw/misc/macio/gpio.h" > #include "qom/object.h" > diff --git a/include/hw/misc/mos6522.h b/include/hw/misc/mos6522.h > index 05872fffc9..fba45668ab 100644 > --- a/include/hw/misc/mos6522.h > +++ b/include/hw/misc/mos6522.h > @@ -27,9 +27,8 @@ > #ifndef MOS6522_H > #define MOS6522_H > > -#include "exec/memory.h" > +#include "exec/hwaddr.h" > #include "hw/sysbus.h" > -#include "hw/input/adb.h" > #include "qom/object.h" > > #define MOS6522_NUM_REGS 16 Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> ATB, Mark.
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 853e88bfed..7208b90e12 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -27,8 +27,6 @@ #include "hw/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" -#include "hw/input/adb.h" -#include "hw/misc/mos6522.h" #include "hw/misc/macio/cuda.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 97ef8c771b..8575bc1264 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -31,10 +31,7 @@ #include "qemu/osdep.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" -#include "hw/input/adb.h" #include "hw/irq.h" -#include "hw/misc/mos6522.h" -#include "hw/misc/macio/gpio.h" #include "hw/misc/macio/pmu.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 0ed631186c..d6ba47bde9 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/input/adb.h" #include "hw/irq.h" #include "hw/misc/mos6522.h" #include "hw/qdev-properties.h" diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h index 5fe7a7f592..422da43bf9 100644 --- a/include/hw/misc/mac_via.h +++ b/include/hw/misc/mac_via.h @@ -12,6 +12,7 @@ #include "exec/memory.h" #include "hw/sysbus.h" #include "hw/misc/mos6522.h" +#include "hw/input/adb.h" #include "qom/object.h" diff --git a/include/hw/misc/macio/cuda.h b/include/hw/misc/macio/cuda.h index a71deec968..8a6678c749 100644 --- a/include/hw/misc/macio/cuda.h +++ b/include/hw/misc/macio/cuda.h @@ -26,6 +26,7 @@ #ifndef CUDA_H #define CUDA_H +#include "hw/input/adb.h" #include "hw/misc/mos6522.h" #include "qom/object.h" diff --git a/include/hw/misc/macio/pmu.h b/include/hw/misc/macio/pmu.h index 00fcdd23f5..ba76afb52a 100644 --- a/include/hw/misc/macio/pmu.h +++ b/include/hw/misc/macio/pmu.h @@ -10,6 +10,7 @@ #ifndef PMU_H #define PMU_H +#include "hw/input/adb.h" #include "hw/misc/mos6522.h" #include "hw/misc/macio/gpio.h" #include "qom/object.h" diff --git a/include/hw/misc/mos6522.h b/include/hw/misc/mos6522.h index 05872fffc9..fba45668ab 100644 --- a/include/hw/misc/mos6522.h +++ b/include/hw/misc/mos6522.h @@ -27,9 +27,8 @@ #ifndef MOS6522_H #define MOS6522_H -#include "exec/memory.h" +#include "exec/hwaddr.h" #include "hw/sysbus.h" -#include "hw/input/adb.h" #include "qom/object.h" #define MOS6522_NUM_REGS 16
The header hw/input/adb.h is included by some files that don't need it. Clean it up and include only where necessary. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- hw/misc/macio/cuda.c | 2 -- hw/misc/macio/pmu.c | 3 --- hw/misc/mos6522.c | 1 - include/hw/misc/mac_via.h | 1 + include/hw/misc/macio/cuda.h | 1 + include/hw/misc/macio/pmu.h | 1 + include/hw/misc/mos6522.h | 3 +-- 7 files changed, 4 insertions(+), 8 deletions(-)