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 1672faa4f2fc9e79bc60aacf163d1cd36ce7fa92..01efe4885db478fddcd562333256ece1a1dfad6f 100644 (file)
--- 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 02a0deedd3c9695f65720c420cf327c428d77475..c0e6c43fbd381b52dcc13429753a768c83f2cc7d 100644 (file)
--- 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 f04c4d32387a0b51d2b465379a4e2e56c4d92171..d17a8d43199e10eeab9533f19fbe69c8e3f4a6b9 100644 (file)
--- 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);