From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Tue, 13 Feb 2024 12:01:47 +0000 (+0100)
Subject: hw/timer: Move HPET_INTCAP definition to "hpet.h"
X-Git-Tag: v9.0.0-rc0~55^2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e62f8ffb293c1abb8575b33d6a699c3af83f5698;p=thirdparty%2Fqemu.git

hw/timer: Move HPET_INTCAP definition to "hpet.h"

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>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Luc Michel <luc.michel@amd.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 1672faa4f2f..01efe4885db 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"
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 02a0deedd3c..c0e6c43fbd3 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 f04c4d32387..d17a8d43199 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);