Skip to content

hw: Split RTC devices from hw/timer/ to hw/rtc/

Philippe Mathieu-Daudé qemu-arm qemu-devel qemu-trivial 2 versions – Applied

Status from this message: Applied to my trivial-patches branch.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest14 patches 19 repliesApplied
  2. v113 patches 27 repliesSuperseded

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/14hw/timer: Compile devices not target-dependent as common objecthw/timer/Makefile.objs+11 -111 reply
2/14hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectoryMAINTAINERS Makefile.objs hw/Kconfig +10 more+21 -171 reply
3/14hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectoryMAINTAINERS hw/alpha/dp264.c hw/hppa/machine.c +18 more+34 -261 reply
4/14hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectoryMAINTAINERS hw/ppc/ppc405_boards.c hw/ppc/prep.c +11 more+73 -481 reply
5/14hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectoryMAINTAINERS hw/rtc/Kconfig hw/rtc/Makefile.objs +3 more+6 -61 reply
6/14hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectoryMAINTAINERS hw/rtc/Kconfig hw/rtc/Makefile.objs +8 more+31 -133 replies
7/14hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectoryMAINTAINERS hw/rtc/Kconfig hw/rtc/Makefile.objs +3 more+6 -61 reply
8/14hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectoryhw/rtc/Kconfig hw/rtc/Makefile.objs hw/rtc/ds1338.c +2 more+5 -51 reply
9/14hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectoryhw/rtc/Makefile.objs hw/rtc/trace-events hw/rtc/xlnx-zynqmp-rtc.c +4 more+9 -91 reply
10/14hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectoryhw/rtc/Makefile.objs hw/rtc/exynos4210_rtc.c hw/timer/Makefile.objs+1 -11 reply
11/14hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectoryhw/rtc/Makefile.objs hw/rtc/aspeed_rtc.c hw/rtc/trace-events +4 more+11 -101 reply
12/14hw/rtc/mc146818: Include mc146818rtc_regs.h a bit lesshw/rtc/mc146818rtc.c hw/timer/hpet.c include/hw/rtc/mc146818rtc.h+2 -11 reply
13/14hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" includehw/rtc/xlnx-zynqmp-rtc.c+0 -11 reply
14/14hw/rtc/aspeed_rtc: Remove unused includesinclude/hw/rtc/aspeed_rtc.h+0 -31 reply

Reviews trailers per patch

All 14 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchAlistair FrancisThomas HuthDavid GibsonCédric Le GoaterPeter MaydellArtyom Tarasenko
SeriesA-b
1/14R-b R-b
2/14R-b
3/14R-b A-b
4/14R-b
5/14R-b
6/14R-b R-b
7/14R-b
8/14R-b
9/14R-b
10/14R-b
11/14R-b R-b
12/14R-b
13/14R-b
14/14R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v2 thread

Cover letter [PATCH v2 00/14] hw: Split RTC devices from hw/timer/ to hw/rtc/

Since v1: https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg03334.html
- addressed review comments (described in patches 3 and 4)
- added R-b/A-b tags

Whole series now reviewed.

v1 blurb:

When working on timers, I found it confuse to have RTC devices mixed in the hw/timer/ directory.

We can see the models use slighly different APIs:

  $ git grep '#include' hw/timer/|cut -d: -f3-|sort|uniq -c|egrep -v '^      1 '|sort -rn
     33 #include "qemu/osdep.h"
     29 #include "hw/irq.h"
     28 #include "qemu/module.h"
     23 #include "migration/vmstate.h"
     21 #include "hw/sysbus.h"
     20 #include "qemu/timer.h"
     20 #include "qemu/main-loop.h"
     17 #include "qemu/log.h"
     14 #include "hw/qdev-properties.h"
     14 #include "hw/ptimer.h"
      9 #include "trace.h"
      7 #include "qapi/error.h"
      5 #include "hw/hw.h"
      3 #include "sysemu/runstate.h"
      3 #include "qemu/error-report.h"
      3 #include "hw/timer/i8254.h"
      2 #include "qemu/bitops.h"
      2 #include "hw/timer/i8254_internal.h"
      2 #include "hw/registerfields.h"
      2 #include "hw/core/cpu.h"
      2 #include "hw/arm/omap.h"
      2 #include "hw/arm/exynos4210.h"
  $ git grep '#include' hw/rtc/|cut -d: -f3-|sort|uniq -c|egrep -v '^      1 '|sort -rn
     11 #include "qemu/osdep.h"
     10 #include "qemu/module.h"
      9 #include "qemu-common.h"
      8 #include "qemu/timer.h"
      8 #include "migration/vmstate.h"
      6 #include "qemu/bcd.h"
      6 #include "hw/irq.h"
      5 #include "sysemu/sysemu.h"
      5 #include "qemu/log.h"
      5 #include "hw/sysbus.h"
      4 #include "trace.h"
      4 #include "hw/qdev-properties.h"
      3 #include "qemu/cutils.h"
      3 #include "hw/i2c/i2c.h"
      2 #include "sysemu/runstate.h"
      2 #include "m48t59-internal.h"
      2 #include "hw/rtc/m48t59.h"
      2 #include "exec/address-spaces.h"

Split the RTC-related files in the new hw/rtc/ directory.

Philippe Mathieu-Daudé (14):
hw/timer: Compile devices not target-dependent as common object
hw: Move PL031 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move M48T59 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move M41T80 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move sun4v hypervisor RTC from hw/timer/ to hw/rtc/ subdirectory
hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory
hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory
hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory
hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include hw/rtc/aspeed_rtc: Remove unused includes

 MAINTAINERS                                  | 20 +++----
 Makefile.objs                                |  1 +
 hw/Kconfig                                   |  1 +
 hw/Makefile.objs                             |  1 +
 hw/alpha/dp264.c                             |  2 +-
 hw/arm/musca.c                               |  2 +-
 hw/hppa/machine.c                            |  2 +-
 hw/i386/acpi-build.c                         |  2 +-
 hw/i386/pc.c                                 |  2 +-
 hw/i386/pc_q35.c                             |  2 +-
 hw/mips/mips_fulong2e.c                      |  2 +-
 hw/mips/mips_jazz.c                          |  2 +-
 hw/mips/mips_malta.c                         |  2 +-
 hw/mips/mips_r4k.c                           |  2 +-
 hw/ppc/pnv.c                                 |  2 +-
 hw/ppc/ppc405_boards.c                       |  2 +-
 hw/ppc/prep.c                                |  4 +-
 hw/rtc/Kconfig                               | 23 ++++++++
 hw/rtc/Makefile.objs                         | 13 +++++
 hw/{timer => rtc}/aspeed_rtc.c               |  2 +-
 hw/{timer => rtc}/ds1338.c                   |  0
 hw/{timer => rtc}/exynos4210_rtc.c           |  0
 hw/{timer => rtc}/m41t80.c                   |  0
 hw/{timer => rtc}/m48t59-internal.h          |  0
 hw/{timer => rtc}/m48t59-isa.c               |  4 +-
 hw/{timer => rtc}/m48t59.c                   |  2 +-
 hw/{timer => rtc}/mc146818rtc.c              |  3 +-
 hw/{timer => rtc}/pl031.c                    |  2 +-
 hw/{timer => rtc}/sun4v-rtc.c                |  2 +-
 hw/rtc/trace-events                          | 19 +++++++
 hw/{timer => rtc}/twl92230.c                 |  0
 hw/{timer => rtc}/xlnx-zynqmp-rtc.c          |  3 +-
 hw/sparc/sun4m.c                             |  2 +-
 hw/sparc64/niagara.c                         |  2 +-
 hw/sparc64/sun4u.c                           |  2 +-
 hw/timer/Kconfig                             | 24 ---------
 hw/timer/Makefile.objs                       | 35 ++++--------
 hw/timer/hpet.c                              |  3 +-
 hw/timer/trace-events                        | 18 -------
 include/hw/arm/aspeed_soc.h                  |  2 +-
 include/hw/arm/xlnx-zynqmp.h                 |  2 +-
 include/hw/{timer => rtc}/aspeed_rtc.h       |  9 ++--
 include/hw/rtc/m48t59.h                      | 57 ++++++++++++++++++++
 include/hw/{timer => rtc}/mc146818rtc.h      | 13 +++--
 include/hw/{timer => rtc}/mc146818rtc_regs.h |  5 +-
 include/hw/{timer => rtc}/pl031.h            |  5 +-
 include/hw/rtc/sun4v-rtc.h                   | 19 +++++++
 include/hw/{timer => rtc}/xlnx-zynqmp-rtc.h  |  6 +--
 include/hw/timer/m48t59.h                    | 32 -----------
 include/hw/timer/sun4v-rtc.h                 |  1 -
 tests/rtc-test.c                             |  2 +-
 51 files changed, 208 insertions(+), 155 deletions(-)
 create mode 100644 hw/rtc/Kconfig
 create mode 100644 hw/rtc/Makefile.objs
 rename hw/{timer => rtc}/aspeed_rtc.c (99%)
 rename hw/{timer => rtc}/ds1338.c (100%)
 rename hw/{timer => rtc}/exynos4210_rtc.c (100%)
 rename hw/{timer => rtc}/m41t80.c (100%)
 rename hw/{timer => rtc}/m48t59-internal.h (100%)
 rename hw/{timer => rtc}/m48t59-isa.c (98%)
 rename hw/{timer => rtc}/m48t59.c (99%)
 rename hw/{timer => rtc}/mc146818rtc.c (99%)
 rename hw/{timer => rtc}/pl031.c (99%)
 rename hw/{timer => rtc}/sun4v-rtc.c (98%)
 create mode 100644 hw/rtc/trace-events
 rename hw/{timer => rtc}/twl92230.c (100%)
 rename hw/{timer => rtc}/xlnx-zynqmp-rtc.c (99%)
 rename include/hw/{timer => rtc}/aspeed_rtc.h (80%)
 create mode 100644 include/hw/rtc/m48t59.h
 rename include/hw/{timer => rtc}/mc146818rtc.h (63%)
 rename include/hw/{timer => rtc}/mc146818rtc_regs.h (96%)
 rename include/hw/{timer => rtc}/pl031.h (93%)
 create mode 100644 include/hw/rtc/sun4v-rtc.h
 rename include/hw/{timer => rtc}/xlnx-zynqmp-rtc.h (95%)
 delete mode 100644 include/hw/timer/m48t59.h
 delete mode 100644 include/hw/timer/sun4v-rtc.h
Signature · 1 line
2.20.1