diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-02-13 13:01:47 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-02-20 20:34:21 +0300 |
| commit | e62f8ffb293c1abb8575b33d6a699c3af83f5698 (patch) | |
| tree | c88afa40ec0024465d437e6fb6caa4e2bd6b637c | |
| parent | 22942c10608adc9054cab01e85a8d2f2bc58b276 (diff) | |
| download | qemu-e62f8ffb293c1abb8575b33d6a699c3af83f5698.zip qemu-e62f8ffb293c1abb8575b33d6a699c3af83f5698.tar.gz qemu-e62f8ffb293c1abb8575b33d6a699c3af83f5698.tar.bz2 | |
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>
| -rw-r--r-- | hw/timer/hpet.c | 1 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 2 | ||||
| -rw-r--r-- | include/hw/timer/hpet.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 1672faa..01efe48 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 02a0dee..c0e6c43 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 f04c4d3..d17a8d4 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); |