[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/7] hw/timer: Move HPET_INTCAP definition to "hpet.h"
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 2/7] hw/timer: Move HPET_INTCAP definition to "hpet.h" |
Date: |
Tue, 13 Feb 2024 13:01:47 +0100 |
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
- [PATCH 0/7] hw/i386: Cleanups around 'hw/i386/pc.h', Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 2/7] hw/timer: Move HPET_INTCAP definition to "hpet.h",
Philippe Mathieu-Daudé <=
- [PATCH 1/7] target/i386/monitor: Remove unused 'hw/i386/pc.h' header, Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 3/7] hw/isa/lpc_ich9: Remove unused 'hw/i386/pc.h', Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 4/7] hw/i386/acpi: Declare pc_madt_cpu_entry() in 'acpi-common.h', Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 5/7] hw/i386/port92: Add missing 'hw/isa/isa.h' header, Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 6/7] hw/acpi/cpu_hotplug: Include 'pci_device.h' instead of 'pci.h', Philippe Mathieu-Daudé, 2024/02/13
- [PATCH 7/7] hw/acpi/cpu_hotplug: Include 'x86.h' instead of 'pc.h', Philippe Mathieu-Daudé, 2024/02/13
- Re: [PATCH 0/7] hw/i386: Cleanups around 'hw/i386/pc.h', Luc Michel, 2024/02/13
- Re: [PATCH 0/7] hw/i386: Cleanups around 'hw/i386/pc.h', Michael S. Tsirkin, 2024/02/13