Received: by 2002:adf:ef42:0:0:0:0:0 with SMTP id c2csp4172466wrp; Mon, 16 Sep 2019 08:51:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqyA17TweTrLeCwXpa0bqcZGEsxedLoj6W3NRd7PIuK4Tf5VPG5f+YbJi2PXvtL4wZy2naoY X-Received: by 2002:a50:9e26:: with SMTP id z35mr62094874ede.265.1568649078290; Mon, 16 Sep 2019 08:51:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568649078; cv=none; d=google.com; s=arc-20160816; b=L+/KCUrydUrA2JyCK892b6LsHtjtChEx0IThsHOHFqq5OaxMQdabRlsttLz894V8Am Aa6cDpKslB7WrsadyJUnDogICNnRm7d8bNbAuF6qpRbKp70VW925YC8n+5zH0KaGNjCP kBmh/zgroEwb/3WYyGvkir6/MeZDfIxSRyhkAtBpY6xQs4PvhIqjqtaVz7Ce92Td+lFG Fkr3HkDPb4iuCdq9niQky2GnAiaD+yvROc9i3NvrcX5HWC7XOTStXqz9SE31c4EAJMrY uOojWRo32/pfVyR89E7/UcDgF18oJxLjAOOzsoLHTW/PRC/XjxivjhRroY0el9LRALEu r1cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:message-id:date:to:from; bh=M64uFAhxlxK1nz4rDzdejKJBqmxpdZ3WM/UTdi1yTFs=; b=M+fDYM4AVFgLSaWtafyrGNPkIHIdHythWkjQCcdymnAtm2xgt0FBCGDkjaT96Z3wrn sv9RzSEaICv17yxrbAbEWnoPjFPeVmyu8aWHl6UfXlsmUey4Rk34epEhJTy+9WlRenif vdCMTWPNMjesAzkXC1bJtI8eKUDNZeJfZbJ5rCGKyq8fE0mi5VaMzMuZ7inbFf2zDv8K 6TrwW+ztaqeaxMit8im/jvPsXnwhKJlcC15UAIRmTL7NAn814L0WDTlodsR3I7I4XQk/ kWd2Q59BMQYLc31yPmekJkerg2xOpBY9u1bAs5ze4bdGEnerEJk6aQ/W4mPkn0Lbemi+ 5Adg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f35si23971144eda.415.2019.09.16.08.51.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Sep 2019 08:51:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9tHY-0000V1-Lr for alex.bennee@linaro.org; Mon, 16 Sep 2019 11:51:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34949) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9tFc-0007Qp-8N for qemu-devel@nongnu.org; Mon, 16 Sep 2019 11:49:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9tFa-0001T0-Gp for qemu-devel@nongnu.org; Mon, 16 Sep 2019 11:49:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10705) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i9tFV-0001QD-CL; Mon, 16 Sep 2019 11:49:09 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D0FC8A2666F; Mon, 16 Sep 2019 15:49:07 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-115.brq.redhat.com [10.40.204.115]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 678A6194BB; Mon, 16 Sep 2019 15:48:51 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 16 Sep 2019 17:48:34 +0200 Message-Id: <20190916154847.28936-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Mon, 16 Sep 2019 15:49:08 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 00/13] hw: Split RTC devices from hw/timer/ to hw/rtc/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S. Tsirkin" , Mark Cave-Ayland , "Edgar E. Iglesias" , Aleksandar Rikalo , Helge Deller , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Joel Stanley , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Alistair Francis , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Paolo Bonzini , Richard Henderson , Andrew Jeffery , qemu-ppc@nongnu.org, Aleksandar Markovic , Igor Mammedov , Aurelien Jarno Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: 3T1qVPc7qjXZ 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=C3=A9 (13): 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 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 =3D> rtc}/aspeed_rtc.c | 2 +- hw/{timer =3D> rtc}/ds1338.c | 0 hw/{timer =3D> rtc}/exynos4210_rtc.c | 0 hw/{timer =3D> rtc}/m41t80.c | 0 hw/{timer =3D> rtc}/m48t59-internal.h | 0 hw/{timer =3D> rtc}/m48t59-isa.c | 4 +- hw/{timer =3D> rtc}/m48t59.c | 2 +- hw/{timer =3D> rtc}/mc146818rtc.c | 3 +- hw/{timer =3D> rtc}/pl031.c | 2 +- hw/{timer =3D> rtc}/sun4v-rtc.c | 2 +- hw/rtc/trace-events | 19 +++++++ hw/{timer =3D> rtc}/twl92230.c | 0 hw/{timer =3D> 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 =3D> rtc}/aspeed_rtc.h | 3 -- include/hw/rtc/m48t59.h | 57 ++++++++++++++++++++ include/hw/rtc/mc146818rtc.h | 37 +++++++++++++ include/hw/{timer =3D> rtc}/mc146818rtc_regs.h | 1 + include/hw/{timer =3D> rtc}/pl031.h | 5 +- include/hw/rtc/sun4v-rtc.h | 19 +++++++ include/hw/{timer =3D> rtc}/xlnx-zynqmp-rtc.h | 6 +-- include/hw/timer/mc146818rtc.h | 14 ----- include/hw/timer/sun4v-rtc.h | 1 - tests/rtc-test.c | 2 +- 51 files changed, 230 insertions(+), 129 deletions(-) create mode 100644 hw/rtc/Kconfig create mode 100644 hw/rtc/Makefile.objs rename hw/{timer =3D> rtc}/aspeed_rtc.c (99%) rename hw/{timer =3D> rtc}/ds1338.c (100%) rename hw/{timer =3D> rtc}/exynos4210_rtc.c (100%) rename hw/{timer =3D> rtc}/m41t80.c (100%) rename hw/{timer =3D> rtc}/m48t59-internal.h (100%) rename hw/{timer =3D> rtc}/m48t59-isa.c (98%) rename hw/{timer =3D> rtc}/m48t59.c (99%) rename hw/{timer =3D> rtc}/mc146818rtc.c (99%) rename hw/{timer =3D> rtc}/pl031.c (99%) rename hw/{timer =3D> rtc}/sun4v-rtc.c (98%) create mode 100644 hw/rtc/trace-events rename hw/{timer =3D> rtc}/twl92230.c (100%) rename hw/{timer =3D> rtc}/xlnx-zynqmp-rtc.c (99%) rename include/hw/{timer =3D> rtc}/aspeed_rtc.h (92%) create mode 100644 include/hw/rtc/m48t59.h create mode 100644 include/hw/rtc/mc146818rtc.h rename include/hw/{timer =3D> rtc}/mc146818rtc_regs.h (98%) rename include/hw/{timer =3D> rtc}/pl031.h (93%) create mode 100644 include/hw/rtc/sun4v-rtc.h rename include/hw/{timer =3D> rtc}/xlnx-zynqmp-rtc.h (95%) delete mode 100644 include/hw/timer/mc146818rtc.h delete mode 100644 include/hw/timer/sun4v-rtc.h --=20 2.20.1