| Message ID | 20191015162705.28087-5-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge | expand |
On 10/17/19 5:02 PM, Aleksandar Markovic wrote: > > > On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <philmd@redhat.com > <mailto:philmd@redhat.com>> wrote: > > From: Philippe Mathieu-Daudé <f4bug@amsat.org <mailto:f4bug@amsat.org>> > > The ISA default number for the RTC devices is not related to its > registers neither. Move this definition to "hw/timer/mc146818rtc.h". > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com > <mailto:philmd@redhat.com>> > --- > include/hw/timer/mc146818rtc.h | 2 ++ > include/hw/timer/mc146818rtc_regs.h | 2 -- > tests/rtc-test.c | 1 + > 3 files changed, 3 insertions(+), 2 deletions(-) > > > Philippe, do this and related patches clash with your recent > reorganization of timers/rtcs? Indeed, but since big boring series take time to get merged, I prefer to have it reviewed already, then I'll rebase and fix conflicts on the one that isn't merged. Thanks for reviewing the other patches! > A. > > diff --git a/include/hw/timer/mc146818rtc.h > b/include/hw/timer/mc146818rtc.h > index 0f1c886e5b..17761cf6d9 100644 > --- a/include/hw/timer/mc146818rtc.h > +++ b/include/hw/timer/mc146818rtc.h > @@ -39,6 +39,8 @@ typedef struct RTCState { > QLIST_ENTRY(RTCState) link; > } RTCState; > > +#define RTC_ISA_IRQ 8 > + > ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, > qemu_irq intercept_irq); > void rtc_set_memory(ISADevice *dev, int addr, int val); > diff --git a/include/hw/timer/mc146818rtc_regs.h > b/include/hw/timer/mc146818rtc_regs.h > index bfbb57e570..631f71cfd9 100644 > --- a/include/hw/timer/mc146818rtc_regs.h > +++ b/include/hw/timer/mc146818rtc_regs.h > @@ -27,8 +27,6 @@ > > #include "qemu/timer.h" > > -#define RTC_ISA_IRQ 8 > - > #define RTC_SECONDS 0 > #define RTC_SECONDS_ALARM 1 > #define RTC_MINUTES 2 > diff --git a/tests/rtc-test.c b/tests/rtc-test.c > index 6309b0ef6c..18f895690f 100644 > --- a/tests/rtc-test.c > +++ b/tests/rtc-test.c > @@ -15,6 +15,7 @@ > > #include "libqtest-single.h" > #include "qemu/timer.h" > +#include "hw/timer/mc146818rtc.h" > #include "hw/timer/mc146818rtc_regs.h" > > #define UIP_HOLD_LENGTH (8 * NANOSECONDS_PER_SECOND / 32768) > -- > 2.21.0 > >
diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index 0f1c886e5b..17761cf6d9 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -39,6 +39,8 @@ typedef struct RTCState { QLIST_ENTRY(RTCState) link; } RTCState; +#define RTC_ISA_IRQ 8 + ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); diff --git a/include/hw/timer/mc146818rtc_regs.h b/include/hw/timer/mc146818rtc_regs.h index bfbb57e570..631f71cfd9 100644 --- a/include/hw/timer/mc146818rtc_regs.h +++ b/include/hw/timer/mc146818rtc_regs.h @@ -27,8 +27,6 @@ #include "qemu/timer.h" -#define RTC_ISA_IRQ 8 - #define RTC_SECONDS 0 #define RTC_SECONDS_ALARM 1 #define RTC_MINUTES 2 diff --git a/tests/rtc-test.c b/tests/rtc-test.c index 6309b0ef6c..18f895690f 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -15,6 +15,7 @@ #include "libqtest-single.h" #include "qemu/timer.h" +#include "hw/timer/mc146818rtc.h" #include "hw/timer/mc146818rtc_regs.h" #define UIP_HOLD_LENGTH (8 * NANOSECONDS_PER_SECOND / 32768)