Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iGABn-0002dr-Pv for mharc-qemu-trivial@gnu.org; Thu, 03 Oct 2019 19:07:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47007) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGABj-0002YV-NZ for qemu-trivial@nongnu.org; Thu, 03 Oct 2019 19:07:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGABi-0007EN-JS for qemu-trivial@nongnu.org; Thu, 03 Oct 2019 19:07:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37032) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iGABb-00074y-Id; Thu, 03 Oct 2019 19:07:03 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7CE455117D; Thu, 3 Oct 2019 23:07:02 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-21.brq.redhat.com [10.40.204.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 541BC10018F8; Thu, 3 Oct 2019 23:06:48 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Gibson , Artyom Tarasenko , Aleksandar Rikalo , Marcel Apfelbaum , Alistair Francis , Joel Stanley , qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Mark Cave-Ayland , Aleksandar Markovic , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-trivial@nongnu.org, "Edgar E. Iglesias" , Thomas Huth , "Michael S. Tsirkin" , Andrew Jeffery , Helge Deller , Peter Maydell , Aurelien Jarno , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Richard Henderson , Laurent Vivier , Eduardo Habkost , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Subject: [PATCH v2 12/14] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less Date: Fri, 4 Oct 2019 01:04:02 +0200 Message-Id: <20191003230404.19384-13-philmd@redhat.com> In-Reply-To: <20191003230404.19384-1-philmd@redhat.com> References: <20191003230404.19384-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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 03 Oct 2019 23:07:02 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2019 23:07:14 -0000 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/mc146818rtc.c | 1 + hw/timer/hpet.c | 1 + include/hw/rtc/mc146818rtc.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index ced15f764f..9d4ed54f65 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -35,6 +35,7 @@ #include "sysemu/reset.h" #include "sysemu/runstate.h" #include "hw/rtc/mc146818rtc.h" +#include "hw/rtc/mc146818rtc_regs.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 02bf8a8ce8..9f17aaa278 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -34,6 +34,7 @@ #include "hw/timer/hpet.h" #include "hw/sysbus.h" #include "hw/rtc/mc146818rtc.h" +#include "hw/rtc/mc146818rtc_regs.h" #include "migration/vmstate.h" #include "hw/timer/i8254.h" =20 diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h index 2e9331637a..7fa59d4279 100644 --- a/include/hw/rtc/mc146818rtc.h +++ b/include/hw/rtc/mc146818rtc.h @@ -10,7 +10,6 @@ #define HW_RTC_MC146818RTC_H =20 #include "hw/isa/isa.h" -#include "hw/rtc/mc146818rtc_regs.h" =20 #define TYPE_MC146818_RTC "mc146818rtc" =20 --=20 2.20.1