Received: by 2002:adf:ef42:0:0:0:0:0 with SMTP id c2csp4227951wrp; Mon, 16 Sep 2019 09:42:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqyDsE5esdAXFw6NJACc62J2vROBjRRcD5StSdY6qYMTUevzq2zYixcbwrAiLEXsDg2ig5Wn X-Received: by 2002:a37:85c4:: with SMTP id h187mr907782qkd.217.1568652128553; Mon, 16 Sep 2019 09:42:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568652128; cv=none; d=google.com; s=arc-20160816; b=cQRizbSUhIom/53kjeAv7hK5PhANV1gmULfK4V9qlYKrTzSV6MQMI8W4Kmvi6KPFAh 5ODB9CMq2gFn6tOHxwi74d+L/ZGMk2/pRJclZKi0RQxz6j5pihTt0jIqt/GN3UzeY+wt IjLFsjQLhXg/CtKRhcvx+2wrBpoQYPH7OofBHwDSp26qlVJCuhlonAzxvW3DbOs3srl9 HPdOtsRv+YZfyLtFkgDzg2qfKyeH9SW51737t6n4rhErwrf5PIkVmdnIoG1oT8eRwIi0 6ihZkaZfNJnhzvHgDqKsaOU4JHgbZ4ccJLdU+Zh8ZomwW3UVEOWAwCn0thUQjsd8KiAO 0Lgw== 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:references:in-reply-to :message-id:date:to:from; bh=hOdF0MzBRYlNPDyCVwfdLpGfQrQJ7CfSK08LvSSXVtQ=; b=s16Wsb4/rR3dCoHqKi9/K4w/0ktELgJpcgEKtWdADHmRiJS63//bHnS9XJxjoTO+c7 dLfLj02Tu0UwO6uYFK7cSUPnaZR8brd/N4BDde1Q3ryRHvdIRmFLKo5earKk2I2MwvXX TfKTE4hGhlRgA1YarKdhZQTAyxOnDci5+nr4izxHC6KTSgOLaZLhBU4o3VX2ULfaHtof sc7C2dGBkr9S85gG/y7SMWLRRoU4PF+LHNl/xvLNgh7uHegQGaCh0qf3IuA8kwtIkSLL ggvhCfiPOLE+JEWcLBKC9jM4hdLdkmQQ4eHkgPMOwrqNwH6mQI79PAMjCeOEtXFAeaFi cknA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-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 t139si28163003qke.16.2019.09.16.09.42.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Sep 2019 09:42:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-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-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:37148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9u4l-0000Vm-Lk for alex.bennee@linaro.org; Mon, 16 Sep 2019 12:42:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36024) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9tIp-0003bG-VV for qemu-arm@nongnu.org; Mon, 16 Sep 2019 11:52:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9tIo-0002kJ-PM for qemu-arm@nongnu.org; Mon, 16 Sep 2019 11:52:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57414) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i9tIo-0002k4-J6; Mon, 16 Sep 2019 11:52:34 -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 A3B433090FC9; Mon, 16 Sep 2019 15:52:33 +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 86C2F196AE; Mon, 16 Sep 2019 15:52:21 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 16 Sep 2019 17:48:46 +0200 Message-Id: <20190916154847.28936-13-philmd@redhat.com> In-Reply-To: <20190916154847.28936-1-philmd@redhat.com> References: <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.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 16 Sep 2019 15:52:33 +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-arm] [PATCH 12/13] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less X-BeenThere: qemu-arm@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 , Aleksandar Rikalo , Helge Deller , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Joel Stanley , Marcel Apfelbaum , 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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: +7/7I3w0NSOn 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. 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 888e04f9ab..09e273a2a1 100644 --- a/include/hw/rtc/mc146818rtc.h +++ b/include/hw/rtc/mc146818rtc.h @@ -26,7 +26,6 @@ #define 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