From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2BC1CA9EAF for ; Thu, 24 Oct 2019 14:18:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A04521906 for ; Thu, 24 Oct 2019 14:18:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KSPjoF7Y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A04521906 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNdwE-0002Z4-VZ for qemu-devel@archiver.kernel.org; Thu, 24 Oct 2019 10:18:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34971) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNdjA-0008Ek-Qi for qemu-devel@nongnu.org; Thu, 24 Oct 2019 10:04:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNdj9-0007s8-M0 for qemu-devel@nongnu.org; Thu, 24 Oct 2019 10:04:36 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:36481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNdj9-0007rq-Ey for qemu-devel@nongnu.org; Thu, 24 Oct 2019 10:04:35 -0400 Received: by mail-wm1-x335.google.com with SMTP id c22so2747571wmd.1 for ; Thu, 24 Oct 2019 07:04:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DDYGyaLmE3BDNJATtq1uXRqF7WOHQrSKzbLNf8DRnU4=; b=KSPjoF7YphRGHDA5M4aW1CfRFb8rv6dWweYc9JOWBBKCkAs31ZKSn054FG/fYFgTuE DlUfqzNZ/e39poNqYpd857b+ZgF1XCj6obY/Em4tYMBIN7U/HYJti18BCkFVUNNN8rhv 5MgEqNG6M2Fgjryc+8oknarMM1X9RzEeYNQdcgR4jm97Gnfv0Eqp8yTT7EkI+9My5UZm YDLQRYRMd4OD2d7hWHmrfXMHiJNhCqqJuQu7n2fjo3Nkji6axAweG9eeQywRwvwZCgvF 2/X2Y4d7VTw0YO0vBM6vi0ywUvd86H6oylSP4M5VRJgkMw9ulGOv+rhpFWUYAUS2GFBQ v1zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DDYGyaLmE3BDNJATtq1uXRqF7WOHQrSKzbLNf8DRnU4=; b=dgdqlh9DabXp7RkhHc13fE7Nn71p7pk+llhQ6rKyWT50l8Hzy4WQF6UcLYaa9aGZN4 8B5uHd0n4zeXP+t8/WrnuhGWLQRyF39pVp/WIgFa6QvhV3CFL3s8XZSJlJ8Sat4znu4d aapfpSY6ltWBqyy6j26p/Y03XtJXCHz38i7un3Ta3IatWJrHjVXSpdlMHY1rNV2sp67z eBxfm5F2rXexhj3da70f3za6Ntbl0FAkqKJvhmkaArRn2FbK7QlRtSz3hqcZk4pqzbO0 fP4tHOmZQH6D1AM6C3cpCLbQEJa1UmAwaamWjX4x5PNgE3XirtZsZZKRHqlRAnmJZ7MU Jm1g== X-Gm-Message-State: APjAAAWff9kYlFcJDF1R9s/56VBpZ9pq41dAtN7WvvxCgwjBd0+61c8d xVD9C3gLxOggEtZX6PpPaQVG7JuL X-Google-Smtp-Source: APXvYqwgGiMGlJmNFlJBQhO0bNHC3eFg2SEGufh6lb2pmsiHD6kTZV0CwThuqVQWkR+S9GmvOBWumA== X-Received: by 2002:a05:600c:2503:: with SMTP id d3mr5469199wma.44.1571925874184; Thu, 24 Oct 2019 07:04:34 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id b7sm10610155wrn.53.2019.10.24.07.04.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 07:04:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 33/39] mc146818rtc: Include mc146818rtc_regs.h directly in mc146818rtc.c Date: Thu, 24 Oct 2019 16:03:49 +0200 Message-Id: <1571925835-31930-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1571925835-31930-1-git-send-email-pbonzini@redhat.com> References: <1571925835-31930-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Devices/boards wanting to use the MC146818 RTC don't need the knowledge its internal registers. Move the "mc146818rtc_regs.h" inclusion to mc146818rtc.c where it is required. We can not move this file from include/hw/timer/ to hw/timer/ for local inclusion because the ACPI FADT table use the RTC_CENTURY register address. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20191018133547.10936-4-philmd@redhat.com> Signed-off-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- hw/timer/mc146818rtc.c | 1 + include/hw/timer/mc146818rtc.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 09edb93..dce4dae 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -40,6 +40,7 @@ #include "qapi/qapi-events-misc-target.h" #include "qapi/visitor.h" #include "exec/address-spaces.h" +#include "hw/timer/mc146818rtc_regs.h" #ifdef TARGET_I386 #include "qapi/qapi-commands-misc-target.h" diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index 17761cf..a857dcd 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -5,7 +5,6 @@ #include "qemu/queue.h" #include "qemu/timer.h" #include "hw/isa/isa.h" -#include "hw/timer/mc146818rtc_regs.h" #define TYPE_MC146818_RTC "mc146818rtc" #define MC146818_RTC(obj) OBJECT_CHECK(RTCState, (obj), TYPE_MC146818_RTC) -- 1.8.3.1