On 9/17/19 4:25 AM, David Gibson wrote:
> On Mon, Sep 16, 2019 at 05:48:38PM +0200, Philippe Mathieu-Daudé wrote:
>> The M48T59 is a Real Time Clock, not a timer.
>> Move it under the hw/rtc/ subdirectory.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
>> ---
>> MAINTAINERS | 4 +-
>> hw/ppc/ppc405_boards.c | 2 +-
>> hw/ppc/prep.c | 2 +-
>> hw/rtc/Kconfig | 3 ++
>> hw/rtc/Makefile.objs | 4 ++
>> hw/{timer => rtc}/m48t59-internal.h | 0
>> hw/{timer => rtc}/m48t59-isa.c | 4 +-
>> hw/{timer => rtc}/m48t59.c | 2 +-
>> hw/sparc/sun4m.c | 2 +-
>> hw/sparc64/sun4u.c | 2 +-
>> hw/timer/Kconfig | 3 --
>> hw/timer/Makefile.objs | 4 --
>> include/hw/rtc/m48t59.h | 57 +++++++++++++++++++++++++++++
>
> Uh.. this file seems to be coming out of nowhere, which doesn't seem
> right for a code motion.
Good catch!
>
>> 13 files changed, 73 insertions(+), 16 deletions(-)
>> rename hw/{timer => rtc}/m48t59-internal.h (100%)
>> rename hw/{timer => rtc}/m48t59-isa.c (98%)
>> rename hw/{timer => rtc}/m48t59.c (99%)
>> create mode 100644 include/hw/rtc/m48t59.h
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 481f2318cb..679b026fe0 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -1064,9 +1064,9 @@ F: hw/pci-host/prep.[hc]
>> F: hw/isa/i82378.c
>> F: hw/isa/pc87312.c
>> F: hw/dma/i82374.c
>> -F: hw/timer/m48t59-isa.c
>> +F: hw/rtc/m48t59-isa.c
>> F: include/hw/isa/pc87312.h
>> -F: include/hw/timer/m48t59.h
>> +F: include/hw/rtc/m48t59.h
[...]
Not sure how I ended not removing include/hw/timer/m48t59.h, since I
used 'git mv' in all the series. I might have missed a conflict when
switching between branches...
Ah I now remember, I had to rebase after Markus big header cleanup, this
is probably when I messed with this one :)
