Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1585776/?format=api
{ "id": 1585776, "url": "http://patchwork.ozlabs.org/api/patches/1585776/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20220128153009.2467560-5-peter.maydell@linaro.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20220128153009.2467560-5-peter.maydell@linaro.org>", "list_archive_url": null, "date": "2022-01-28T15:29:41", "name": "[PULL,04/32] rtc: Move RTC function prototypes to their own header", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "28c1283093a87b7ccb861c2f0160d9f6517622c9", "submitter": { "id": 5111, "url": "http://patchwork.ozlabs.org/api/people/5111/?format=api", "name": "Peter Maydell", "email": "peter.maydell@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20220128153009.2467560-5-peter.maydell@linaro.org/mbox/", "series": [ { "id": 283405, "url": "http://patchwork.ozlabs.org/api/series/283405/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=283405", "date": "2022-01-28T15:29:53", "name": "[PULL,01/32] Update copyright dates to 2022", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/283405/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1585776/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1585776/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "bilbo.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=Z0YEnBes;\n\tdkim-atps=neutral", "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=<UNKNOWN>)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby bilbo.ozlabs.org (Postfix) with ESMTPS id 4JljCP2Khrz9t3b\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 29 Jan 2022 03:12:17 +1100 (AEDT)", "from localhost ([::1]:56368 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1nDTrC-0005j2-Ne\n\tfor incoming@patchwork.ozlabs.org; Fri, 28 Jan 2022 11:12:14 -0500", "from eggs.gnu.org ([209.51.188.92]:57760)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)\n id 1nDTDD-0002B6-ON\n for qemu-devel@nongnu.org; Fri, 28 Jan 2022 10:30:58 -0500", "from [2a00:1450:4864:20::42b] (port=37870\n helo=mail-wr1-x42b.google.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)\n id 1nDTD0-0006KU-2o\n for qemu-devel@nongnu.org; Fri, 28 Jan 2022 10:30:49 -0500", "by mail-wr1-x42b.google.com with SMTP id w11so11577980wra.4\n for <qemu-devel@nongnu.org>; Fri, 28 Jan 2022 07:30:19 -0800 (PST)", "from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])\n by smtp.gmail.com with ESMTPSA id j3sm4749485wrb.57.2022.01.28.07.30.17\n for <qemu-devel@nongnu.org>\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 28 Jan 2022 07:30:17 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n h=from:to:subject:date:message-id:in-reply-to:references:mime-version\n :content-transfer-encoding;\n bh=gRZn6FSNPea9FydrN/095+qBdxZM1DTyJ5pjqceoBzc=;\n b=Z0YEnBesj0hNdyQaojj3DysHUHvFC4NYb2cAwyVb3qK8YwdeYkG+O6ACF+QakJJv9e\n G7mCtBMaEBycrBJEiBfPQmgOi3+UyuTpFK9sfk4+cungKiAHxZSc4jMT942oYDwGStXr\n TwFdH0prW5so3u6gcqCIJXiuI8KUDxGA+HuOUIZaStshbI0jV2sMkbsgAfJYHqLS/bof\n qQ17RhRTTIy9jEGQYqNoaIJ/bsDgNf4cuiR39Nx2FH3lPbKNLiQMcf6OC6zvnDkEP9Ec\n mpYrL/yEfBDZOsLH1fS1qWqzA8nCxKj1ZbOTckJ1lVgQ49wSwnl8BDvXrml2yh3oEcCh\n KNbg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=gRZn6FSNPea9FydrN/095+qBdxZM1DTyJ5pjqceoBzc=;\n b=RaQjwLBHRmS2TfpiUns721m9uLuuwi3mTrcu+t8FwoaqfsnfR0cDh3Z0tZuxCcAozw\n URgoN0/WmHbM6tUMSaoo6JAWD/ap5emfRgajSmlvFSKJeIUc/kBVf6W7zcpTmyH2NrJI\n MGnSGFlkDPrI9KJzQrcDpAe2aUyT2lKkFboJfnTr/yiptTsH6EUkFeRFFUPBb8m2tUBW\n FCec092RsSrFouQHO/jg9V3wyWLlsNLtAAuJdp7qAgkeM9IpsBIKqL39qHK9gXnsCR6y\n KjLjE6oVzvddOyRbM73pFUSD7oLpUYyEZr6K2MqEqc+8TWn4+gI8qxtM/qj3/Wcr0UKc\n rc8A==", "X-Gm-Message-State": "AOAM533RvINaiCipO4oas9SBUryN9mPoQfF/Xi4xySHyuEd+FcB2d/v1\n C54qdnJJRCirRAQZtOK/Wsbzg2ytm2uVKg==", "X-Google-Smtp-Source": "\n ABdhPJz8Bw5l10bcoT+v1By11ekBHRLdxTSL70Jdr/x+hFe3aqsZZixcecNE+vVgPLeyRxSum7tJzg==", "X-Received": "by 2002:a5d:6a12:: with SMTP id m18mr7256549wru.528.1643383818003;\n Fri, 28 Jan 2022 07:30:18 -0800 (PST)", "From": "Peter Maydell <peter.maydell@linaro.org>", "To": "qemu-devel@nongnu.org", "Subject": "[PULL 04/32] rtc: Move RTC function prototypes to their own header", "Date": "Fri, 28 Jan 2022 15:29:41 +0000", "Message-Id": "<20220128153009.2467560-5-peter.maydell@linaro.org>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220128153009.2467560-1-peter.maydell@linaro.org>", "References": "<20220128153009.2467560-1-peter.maydell@linaro.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-Host-Lookup-Failed": "Reverse DNS lookup failed for 2a00:1450:4864:20::42b\n (failed)", "Received-SPF": "pass client-ip=2a00:1450:4864:20::42b;\n envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.google.com", "X-Spam_score_int": "-12", "X-Spam_score": "-1.3", "X-Spam_bar": "-", "X-Spam_report": "(-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001,\n T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "softmmu/rtc.c defines two public functions: qemu_get_timedate() and\nqemu_timedate_diff(). Currently we keep the prototypes for these in\nqemu-common.h, but most files don't need them. Move them to their\nown header, a new include/sysemu/rtc.h.\n\nSince the C files using these two functions did not need to include\nqemu-common.h for any other reason, we can remove those include lines\nwhen we add the include of the new rtc.h.\n\nThe license for the .h file follows that of the softmmu/rtc.c\nwhere both the functions are defined.\n\nSigned-off-by: Peter Maydell <peter.maydell@linaro.org>\nReviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\n---\n include/qemu-common.h | 3 ---\n include/sysemu/rtc.h | 58 ++++++++++++++++++++++++++++++++++++++++\n hw/arm/omap1.c | 2 +-\n hw/arm/pxa2xx.c | 2 +-\n hw/arm/strongarm.c | 2 +-\n hw/misc/mac_via.c | 2 +-\n hw/misc/macio/cuda.c | 2 +-\n hw/misc/macio/pmu.c | 2 +-\n hw/ppc/spapr_rtc.c | 2 +-\n hw/rtc/allwinner-rtc.c | 2 +-\n hw/rtc/aspeed_rtc.c | 2 +-\n hw/rtc/ds1338.c | 2 +-\n hw/rtc/exynos4210_rtc.c | 2 +-\n hw/rtc/goldfish_rtc.c | 2 +-\n hw/rtc/m41t80.c | 2 +-\n hw/rtc/m48t59.c | 2 +-\n hw/rtc/mc146818rtc.c | 2 +-\n hw/rtc/pl031.c | 2 +-\n hw/rtc/twl92230.c | 2 +-\n hw/rtc/xlnx-zynqmp-rtc.c | 2 +-\n hw/s390x/tod-tcg.c | 2 +-\n hw/scsi/megasas.c | 2 +-\n net/dump.c | 2 +-\n softmmu/rtc.c | 2 +-\n 24 files changed, 80 insertions(+), 25 deletions(-)\n create mode 100644 include/sysemu/rtc.h", "diff": "diff --git a/include/qemu-common.h b/include/qemu-common.h\nindex 0e7e7bab959..68b2e3bc109 100644\n--- a/include/qemu-common.h\n+++ b/include/qemu-common.h\n@@ -26,9 +26,6 @@\n int qemu_main(int argc, char **argv, char **envp);\n #endif\n \n-void qemu_get_timedate(struct tm *tm, int offset);\n-int qemu_timedate_diff(struct tm *tm);\n-\n void *qemu_oom_check(void *ptr);\n \n ssize_t qemu_write_full(int fd, const void *buf, size_t count)\ndiff --git a/include/sysemu/rtc.h b/include/sysemu/rtc.h\nnew file mode 100644\nindex 00000000000..159702b45b5\n--- /dev/null\n+++ b/include/sysemu/rtc.h\n@@ -0,0 +1,58 @@\n+/*\n+ * RTC configuration and clock read\n+ *\n+ * Copyright (c) 2003-2021 QEMU contributors\n+ *\n+ * Permission is hereby granted, free of charge, to any person obtaining a copy\n+ * of this software and associated documentation files (the \"Software\"), to deal\n+ * in the Software without restriction, including without limitation the rights\n+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+ * copies of the Software, and to permit persons to whom the Software is\n+ * furnished to do so, subject to the following conditions:\n+ *\n+ * The above copyright notice and this permission notice shall be included in\n+ * all copies or substantial portions of the Software.\n+ *\n+ * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\n+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n+ * THE SOFTWARE.\n+ */\n+\n+#ifndef SYSEMU_RTC_H\n+#define SYSEMU_RTC_H\n+\n+/**\n+ * qemu_get_timedate: Get the current RTC time\n+ * @tm: struct tm to fill in with RTC time\n+ * @offset: offset in seconds to adjust the RTC time by before\n+ * converting to struct tm format.\n+ *\n+ * This function fills in @tm with the current RTC time, as adjusted\n+ * by @offset (for example, if @offset is 3600 then the returned time/date\n+ * will be one hour further ahead than the current RTC time).\n+ *\n+ * The usual use is by RTC device models, which should call this function\n+ * to find the time/date value that they should return to the guest\n+ * when it reads the RTC registers.\n+ *\n+ * The behaviour of the clock whose value this function returns will\n+ * depend on the -rtc command line option passed by the user.\n+ */\n+void qemu_get_timedate(struct tm *tm, int offset);\n+\n+/**\n+ * qemu_timedate_diff: Return difference between a struct tm and the RTC\n+ * @tm: struct tm containing the date/time to compare against\n+ *\n+ * Returns the difference in seconds between the RTC clock time\n+ * and the date/time specified in @tm. For example, if @tm specifies\n+ * a timestamp one hour further ahead than the current RTC time\n+ * then this function will return 3600.\n+ */\n+int qemu_timedate_diff(struct tm *tm);\n+\n+#endif\ndiff --git a/hw/arm/omap1.c b/hw/arm/omap1.c\nindex 180d3788f89..9852c2a07ec 100644\n--- a/hw/arm/omap1.c\n+++ b/hw/arm/omap1.c\n@@ -21,7 +21,6 @@\n #include \"qemu/error-report.h\"\n #include \"qemu/main-loop.h\"\n #include \"qapi/error.h\"\n-#include \"qemu-common.h\"\n #include \"cpu.h\"\n #include \"exec/address-spaces.h\"\n #include \"hw/hw.h\"\n@@ -35,6 +34,7 @@\n #include \"sysemu/qtest.h\"\n #include \"sysemu/reset.h\"\n #include \"sysemu/runstate.h\"\n+#include \"sysemu/rtc.h\"\n #include \"qemu/range.h\"\n #include \"hw/sysbus.h\"\n #include \"qemu/cutils.h\"\ndiff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c\nindex 15a247efae2..a6f938f1152 100644\n--- a/hw/arm/pxa2xx.c\n+++ b/hw/arm/pxa2xx.c\n@@ -8,7 +8,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"qemu/error-report.h\"\n #include \"qemu/module.h\"\n #include \"qapi/error.h\"\n@@ -27,6 +26,7 @@\n #include \"chardev/char-fe.h\"\n #include \"sysemu/blockdev.h\"\n #include \"sysemu/qtest.h\"\n+#include \"sysemu/rtc.h\"\n #include \"qemu/cutils.h\"\n #include \"qemu/log.h\"\n #include \"qom/object.h\"\ndiff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c\nindex 939a57dda55..39b8f01ac48 100644\n--- a/hw/arm/strongarm.c\n+++ b/hw/arm/strongarm.c\n@@ -28,7 +28,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"cpu.h\"\n #include \"hw/irq.h\"\n #include \"hw/qdev-properties.h\"\n@@ -41,6 +40,7 @@\n #include \"chardev/char-fe.h\"\n #include \"chardev/char-serial.h\"\n #include \"sysemu/sysemu.h\"\n+#include \"sysemu/rtc.h\"\n #include \"hw/ssi/ssi.h\"\n #include \"qapi/error.h\"\n #include \"qemu/cutils.h\"\ndiff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c\nindex b378e6b3055..71b74c33721 100644\n--- a/hw/misc/mac_via.c\n+++ b/hw/misc/mac_via.c\n@@ -16,7 +16,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"migration/vmstate.h\"\n #include \"hw/sysbus.h\"\n #include \"hw/irq.h\"\n@@ -30,6 +29,7 @@\n #include \"hw/qdev-properties.h\"\n #include \"hw/qdev-properties-system.h\"\n #include \"sysemu/block-backend.h\"\n+#include \"sysemu/rtc.h\"\n #include \"trace.h\"\n #include \"qemu/log.h\"\n \ndiff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c\nindex e917a6a095b..233daf1405f 100644\n--- a/hw/misc/macio/cuda.c\n+++ b/hw/misc/macio/cuda.c\n@@ -24,7 +24,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"hw/ppc/mac.h\"\n #include \"hw/qdev-properties.h\"\n #include \"migration/vmstate.h\"\n@@ -34,6 +33,7 @@\n #include \"qapi/error.h\"\n #include \"qemu/timer.h\"\n #include \"sysemu/runstate.h\"\n+#include \"sysemu/rtc.h\"\n #include \"qapi/error.h\"\n #include \"qemu/cutils.h\"\n #include \"qemu/log.h\"\ndiff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c\nindex eb39c64694a..76c608ee19d 100644\n--- a/hw/misc/macio/pmu.c\n+++ b/hw/misc/macio/pmu.c\n@@ -29,7 +29,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"hw/ppc/mac.h\"\n #include \"hw/qdev-properties.h\"\n #include \"migration/vmstate.h\"\n@@ -41,6 +40,7 @@\n #include \"qapi/error.h\"\n #include \"qemu/timer.h\"\n #include \"sysemu/runstate.h\"\n+#include \"sysemu/rtc.h\"\n #include \"qapi/error.h\"\n #include \"qemu/cutils.h\"\n #include \"qemu/log.h\"\ndiff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c\nindex fba4dfca358..94a5510e4eb 100644\n--- a/hw/ppc/spapr_rtc.c\n+++ b/hw/ppc/spapr_rtc.c\n@@ -26,9 +26,9 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"qemu/timer.h\"\n #include \"sysemu/sysemu.h\"\n+#include \"sysemu/rtc.h\"\n #include \"hw/ppc/spapr.h\"\n #include \"migration/vmstate.h\"\n #include \"qapi/error.h\"\ndiff --git a/hw/rtc/allwinner-rtc.c b/hw/rtc/allwinner-rtc.c\nindex 5606a51d5c5..7e493f0e79d 100644\n--- a/hw/rtc/allwinner-rtc.c\n+++ b/hw/rtc/allwinner-rtc.c\n@@ -23,9 +23,9 @@\n #include \"migration/vmstate.h\"\n #include \"qemu/log.h\"\n #include \"qemu/module.h\"\n-#include \"qemu-common.h\"\n #include \"hw/qdev-properties.h\"\n #include \"hw/rtc/allwinner-rtc.h\"\n+#include \"sysemu/rtc.h\"\n #include \"trace.h\"\n \n /* RTC registers */\ndiff --git a/hw/rtc/aspeed_rtc.c b/hw/rtc/aspeed_rtc.c\nindex 3ca1183558b..f6da7b666d6 100644\n--- a/hw/rtc/aspeed_rtc.c\n+++ b/hw/rtc/aspeed_rtc.c\n@@ -7,11 +7,11 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"hw/rtc/aspeed_rtc.h\"\n #include \"migration/vmstate.h\"\n #include \"qemu/log.h\"\n #include \"qemu/timer.h\"\n+#include \"sysemu/rtc.h\"\n \n #include \"trace.h\"\n \ndiff --git a/hw/rtc/ds1338.c b/hw/rtc/ds1338.c\nindex bc5ce1a9f46..36d8121ddda 100644\n--- a/hw/rtc/ds1338.c\n+++ b/hw/rtc/ds1338.c\n@@ -11,12 +11,12 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"hw/i2c/i2c.h\"\n #include \"migration/vmstate.h\"\n #include \"qemu/bcd.h\"\n #include \"qemu/module.h\"\n #include \"qom/object.h\"\n+#include \"sysemu/rtc.h\"\n \n /* Size of NVRAM including both the user-accessible area and the\n * secondary register area.\ndiff --git a/hw/rtc/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c\nindex 45c0a951c44..ae67641de66 100644\n--- a/hw/rtc/exynos4210_rtc.c\n+++ b/hw/rtc/exynos4210_rtc.c\n@@ -26,7 +26,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"qemu/log.h\"\n #include \"qemu/module.h\"\n #include \"hw/sysbus.h\"\n@@ -39,6 +38,7 @@\n \n #include \"hw/arm/exynos4210.h\"\n #include \"qom/object.h\"\n+#include \"sysemu/rtc.h\"\n \n #define DEBUG_RTC 0\n \ndiff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c\nindex e07ff0164e0..35e493be312 100644\n--- a/hw/rtc/goldfish_rtc.c\n+++ b/hw/rtc/goldfish_rtc.c\n@@ -20,7 +20,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"hw/rtc/goldfish_rtc.h\"\n #include \"migration/vmstate.h\"\n #include \"hw/irq.h\"\n@@ -29,6 +28,7 @@\n #include \"qemu/bitops.h\"\n #include \"qemu/timer.h\"\n #include \"sysemu/sysemu.h\"\n+#include \"sysemu/rtc.h\"\n #include \"qemu/cutils.h\"\n #include \"qemu/log.h\"\n \ndiff --git a/hw/rtc/m41t80.c b/hw/rtc/m41t80.c\nindex 396d110ba2d..a00971a67e1 100644\n--- a/hw/rtc/m41t80.c\n+++ b/hw/rtc/m41t80.c\n@@ -8,13 +8,13 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"qemu/log.h\"\n #include \"qemu/module.h\"\n #include \"qemu/timer.h\"\n #include \"qemu/bcd.h\"\n #include \"hw/i2c/i2c.h\"\n #include \"qom/object.h\"\n+#include \"sysemu/rtc.h\"\n \n #define TYPE_M41T80 \"m41t80\"\n OBJECT_DECLARE_SIMPLE_TYPE(M41t80State, M41T80)\ndiff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c\nindex 690f4e071a1..74345d9d900 100644\n--- a/hw/rtc/m48t59.c\n+++ b/hw/rtc/m48t59.c\n@@ -24,12 +24,12 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"hw/irq.h\"\n #include \"hw/qdev-properties.h\"\n #include \"hw/rtc/m48t59.h\"\n #include \"qemu/timer.h\"\n #include \"sysemu/runstate.h\"\n+#include \"sysemu/rtc.h\"\n #include \"sysemu/sysemu.h\"\n #include \"hw/sysbus.h\"\n #include \"qapi/error.h\"\ndiff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c\nindex 4fbafddb226..e61a0cced4c 100644\n--- a/hw/rtc/mc146818rtc.c\n+++ b/hw/rtc/mc146818rtc.c\n@@ -23,7 +23,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"qemu/cutils.h\"\n #include \"qemu/module.h\"\n #include \"qemu/bcd.h\"\n@@ -36,6 +35,7 @@\n #include \"sysemu/replay.h\"\n #include \"sysemu/reset.h\"\n #include \"sysemu/runstate.h\"\n+#include \"sysemu/rtc.h\"\n #include \"hw/rtc/mc146818rtc.h\"\n #include \"hw/rtc/mc146818rtc_regs.h\"\n #include \"migration/vmstate.h\"\ndiff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c\nindex e7ced90b025..38d9d3c2f38 100644\n--- a/hw/rtc/pl031.c\n+++ b/hw/rtc/pl031.c\n@@ -12,7 +12,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"hw/rtc/pl031.h\"\n #include \"migration/vmstate.h\"\n #include \"hw/irq.h\"\n@@ -20,6 +19,7 @@\n #include \"hw/sysbus.h\"\n #include \"qemu/timer.h\"\n #include \"sysemu/sysemu.h\"\n+#include \"sysemu/rtc.h\"\n #include \"qemu/cutils.h\"\n #include \"qemu/log.h\"\n #include \"qemu/module.h\"\ndiff --git a/hw/rtc/twl92230.c b/hw/rtc/twl92230.c\nindex 0922df5ad30..e8d5eda3fcf 100644\n--- a/hw/rtc/twl92230.c\n+++ b/hw/rtc/twl92230.c\n@@ -20,13 +20,13 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"qemu/timer.h\"\n #include \"hw/i2c/i2c.h\"\n #include \"hw/irq.h\"\n #include \"migration/qemu-file-types.h\"\n #include \"migration/vmstate.h\"\n #include \"sysemu/sysemu.h\"\n+#include \"sysemu/rtc.h\"\n #include \"qemu/bcd.h\"\n #include \"qemu/module.h\"\n #include \"qom/object.h\"\ndiff --git a/hw/rtc/xlnx-zynqmp-rtc.c b/hw/rtc/xlnx-zynqmp-rtc.c\nindex 2bcd14d7795..3e7d61a41c1 100644\n--- a/hw/rtc/xlnx-zynqmp-rtc.c\n+++ b/hw/rtc/xlnx-zynqmp-rtc.c\n@@ -25,7 +25,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"hw/sysbus.h\"\n #include \"hw/register.h\"\n #include \"qemu/bitops.h\"\n@@ -34,6 +33,7 @@\n #include \"hw/irq.h\"\n #include \"qemu/cutils.h\"\n #include \"sysemu/sysemu.h\"\n+#include \"sysemu/rtc.h\"\n #include \"trace.h\"\n #include \"hw/rtc/xlnx-zynqmp-rtc.h\"\n #include \"migration/vmstate.h\"\ndiff --git a/hw/s390x/tod-tcg.c b/hw/s390x/tod-tcg.c\nindex 9bb94ff72bc..7646b4aa380 100644\n--- a/hw/s390x/tod-tcg.c\n+++ b/hw/s390x/tod-tcg.c\n@@ -9,7 +9,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"qapi/error.h\"\n #include \"hw/s390x/tod.h\"\n #include \"qemu/timer.h\"\n@@ -17,6 +16,7 @@\n #include \"qemu/module.h\"\n #include \"cpu.h\"\n #include \"tcg/tcg_s390x.h\"\n+#include \"sysemu/rtc.h\"\n \n static void qemu_s390_tod_get(const S390TODState *td, S390TOD *tod,\n Error **errp)\ndiff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c\nindex c9da5ce0b57..f638ff8831d 100644\n--- a/hw/scsi/megasas.c\n+++ b/hw/scsi/megasas.c\n@@ -19,11 +19,11 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"hw/pci/pci.h\"\n #include \"hw/qdev-properties.h\"\n #include \"sysemu/dma.h\"\n #include \"sysemu/block-backend.h\"\n+#include \"sysemu/rtc.h\"\n #include \"hw/pci/msi.h\"\n #include \"hw/pci/msix.h\"\n #include \"qemu/iov.h\"\ndiff --git a/net/dump.c b/net/dump.c\nindex a07ba624011..6a63b153595 100644\n--- a/net/dump.c\n+++ b/net/dump.c\n@@ -23,7 +23,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"clients.h\"\n #include \"qapi/error.h\"\n #include \"qemu/error-report.h\"\n@@ -33,6 +32,7 @@\n #include \"qapi/visitor.h\"\n #include \"net/filter.h\"\n #include \"qom/object.h\"\n+#include \"sysemu/rtc.h\"\n \n typedef struct DumpState {\n int64_t start_ts;\ndiff --git a/softmmu/rtc.c b/softmmu/rtc.c\nindex 5632684fc9d..7e2956f81e9 100644\n--- a/softmmu/rtc.c\n+++ b/softmmu/rtc.c\n@@ -23,7 +23,6 @@\n */\n \n #include \"qemu/osdep.h\"\n-#include \"qemu-common.h\"\n #include \"qemu/cutils.h\"\n #include \"qapi/error.h\"\n #include \"qapi/qmp/qerror.h\"\n@@ -33,6 +32,7 @@\n #include \"qom/object.h\"\n #include \"sysemu/replay.h\"\n #include \"sysemu/sysemu.h\"\n+#include \"sysemu/rtc.h\"\n \n static enum {\n RTC_BASE_UTC,\n", "prefixes": [ "PULL", "04/32" ] }