3 Commits

Author	SHA1	Message	Date
Paolo Bonzini	673652a785	Merge commit 'df84f17' into HEAD ... This merge fixes a semantic conflict with the trivial tree. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>	2019-10-26 15:38:02 +02:00
Philippe Mathieu-Daudé	7ffcb73d3f	hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less ... 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> Message-Id: <20191003230404.19384-13-philmd@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>	2019-10-24 20:33:07 +02:00
Philippe Mathieu-Daudé	bcdb90640a	hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory ... The MC146818 is a Real Time Clock, not a timer. Move it under the hw/rtc/ subdirectory. Use copyright statement from 80cabfad16 for "hw/rtc/mc146818rtc.h". Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20191003230404.19384-4-philmd@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>	2019-10-24 20:13:10 +02:00