All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <eduardo@habkost.net>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Bernhard Beschow" <shentey@gmail.com>,
	"Ani Sinha" <anisinha@redhat.com>,
	qemu-trivial@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 2/7] hw/timer: Move HPET_INTCAP definition to "hpet.h"
Date: Tue, 13 Feb 2024 13:01:47 +0100	[thread overview]
Message-ID: <20240213120153.90930-3-philmd@linaro.org> (raw)
In-Reply-To: <20240213120153.90930-1-philmd@linaro.org>

HPET_INTCAP is specific to TYPE_HPET, so define it there.
hpet.c doesn't need to include "hw/i386/pc.h" anymore.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/i386/pc.h    | 2 --
 include/hw/timer/hpet.h | 2 ++
 hw/timer/hpet.c         | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index ec0e5efcb2..f9fc42c2be 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -15,8 +15,6 @@
 #include "hw/firmware/smbios.h"
 #include "hw/cxl/cxl.h"
 
-#define HPET_INTCAP "hpet-intcap"
-
 /**
  * PCMachineState:
  * @acpi_dev: link to ACPI PM device that performs ACPI hotplug handling
diff --git a/include/hw/timer/hpet.h b/include/hw/timer/hpet.h
index f04c4d3238..d17a8d4319 100644
--- a/include/hw/timer/hpet.h
+++ b/include/hw/timer/hpet.h
@@ -78,6 +78,8 @@ extern struct hpet_fw_config hpet_cfg;
 
 #define TYPE_HPET "hpet"
 
+#define HPET_INTCAP "hpet-intcap"
+
 static inline bool hpet_find(void)
 {
     return object_resolve_path_type("", TYPE_HPET, NULL);
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 1672faa4f2..01efe4885d 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/i386/pc.h"
 #include "hw/irq.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-- 
2.41.0



  parent reply	other threads:[~2024-02-13 12:03 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-13 12:01 [PATCH 0/7] hw/i386: Cleanups around 'hw/i386/pc.h' Philippe Mathieu-Daudé
2024-02-13 12:01 ` [PATCH 1/7] target/i386/monitor: Remove unused 'hw/i386/pc.h' header Philippe Mathieu-Daudé
2024-02-13 12:01 ` Philippe Mathieu-Daudé [this message]
2024-02-13 12:01 ` [PATCH 3/7] hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h' Philippe Mathieu-Daudé
2024-02-13 12:01 ` [PATCH 4/7] hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h' Philippe Mathieu-Daudé
2024-02-13 18:57   ` Bernhard Beschow
2024-02-14  6:58     ` Philippe Mathieu-Daudé
2024-02-13 12:01 ` [PATCH 5/7] hw/i386/port92: Add missing 'hw/isa/isa.h' header Philippe Mathieu-Daudé
2024-02-13 12:01 ` [PATCH 6/7] hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h' Philippe Mathieu-Daudé
2024-02-13 12:01 ` [PATCH 7/7] hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h' Philippe Mathieu-Daudé
2024-02-13 14:27 ` [PATCH 0/7] hw/i386: Cleanups around 'hw/i386/pc.h' Luc Michel
2024-02-13 15:55 ` Michael S. Tsirkin
2024-02-13 16:00   ` Philippe Mathieu-Daudé
2024-02-15 19:33     ` Bernhard Beschow
2024-02-14 12:45 ` Michael Tokarev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240213120153.90930-3-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=anisinha@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=imammedo@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=shentey@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.