| Message ID | 20191003230404.19384-13-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Split RTC devices from hw/timer/ to hw/rtc/ | expand |
Le 04/10/2019 à 01:04, Philippe Mathieu-Daudé a écrit : > Only 2 source files require the "mc146818rtc_regs.h" header. > Instead of having it processed 12 times, by all objects > using "mc146818rtc.h", include it directly where used. > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/rtc/mc146818rtc.c | 1 + > hw/timer/hpet.c | 1 + > include/hw/rtc/mc146818rtc.h | 1 - > 3 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c > index ced15f764f..9d4ed54f65 100644 > --- a/hw/rtc/mc146818rtc.c > +++ b/hw/rtc/mc146818rtc.c > @@ -35,6 +35,7 @@ > #include "sysemu/reset.h" > #include "sysemu/runstate.h" > #include "hw/rtc/mc146818rtc.h" > +#include "hw/rtc/mc146818rtc_regs.h" > #include "migration/vmstate.h" > #include "qapi/error.h" > #include "qapi/qapi-commands-misc-target.h" > diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c > index 02bf8a8ce8..9f17aaa278 100644 > --- a/hw/timer/hpet.c > +++ b/hw/timer/hpet.c > @@ -34,6 +34,7 @@ > #include "hw/timer/hpet.h" > #include "hw/sysbus.h" > #include "hw/rtc/mc146818rtc.h" > +#include "hw/rtc/mc146818rtc_regs.h" > #include "migration/vmstate.h" > #include "hw/timer/i8254.h" > > diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h > index 2e9331637a..7fa59d4279 100644 > --- a/include/hw/rtc/mc146818rtc.h > +++ b/include/hw/rtc/mc146818rtc.h > @@ -10,7 +10,6 @@ > #define HW_RTC_MC146818RTC_H > > #include "hw/isa/isa.h" > -#include "hw/rtc/mc146818rtc_regs.h" > > #define TYPE_MC146818_RTC "mc146818rtc" > > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index ced15f764f..9d4ed54f65 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -35,6 +35,7 @@ #include "sysemu/reset.h" #include "sysemu/runstate.h" #include "hw/rtc/mc146818rtc.h" +#include "hw/rtc/mc146818rtc_regs.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 02bf8a8ce8..9f17aaa278 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -34,6 +34,7 @@ #include "hw/timer/hpet.h" #include "hw/sysbus.h" #include "hw/rtc/mc146818rtc.h" +#include "hw/rtc/mc146818rtc_regs.h" #include "migration/vmstate.h" #include "hw/timer/i8254.h" diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h index 2e9331637a..7fa59d4279 100644 --- a/include/hw/rtc/mc146818rtc.h +++ b/include/hw/rtc/mc146818rtc.h @@ -10,7 +10,6 @@ #define HW_RTC_MC146818RTC_H #include "hw/isa/isa.h" -#include "hw/rtc/mc146818rtc_regs.h" #define TYPE_MC146818_RTC "mc146818rtc"