[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 28/39] hw/acpi: ACPI_PM_* defines are not restric
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 28/39] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch |
Date: |
Mon, 16 Oct 2017 21:11:58 -0300 |
this allows to remove the old i386/pc dependency on acpi/core.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
include/hw/acpi/acpi.h | 12 ++++++++++++
include/hw/i386/pc.h | 13 -------------
hw/acpi/core.c | 1 -
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index 7b3d93cf0d..30013b0464 100644
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -39,6 +39,18 @@
#define ACPI_PM2_REGISTER_WIDTH 8
#define ACPI_PM_TIMER_WIDTH 32
+/* PC-style peripherals (also used by other machines). */
+#define ACPI_PM_PROP_S3_DISABLED "disable_s3"
+#define ACPI_PM_PROP_S4_DISABLED "disable_s4"
+#define ACPI_PM_PROP_S4_VAL "s4_val"
+#define ACPI_PM_PROP_SCI_INT "sci_int"
+#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd"
+#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd"
+#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base"
+#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk"
+#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"
+#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
+
/* PM Timer ticks per second (HZ) */
#define PM_TIMER_FREQUENCY 3579545
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 087d184ef5..b1b4c918af 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -151,19 +151,6 @@ struct PCMachineClass {
#define PC_MACHINE_CLASS(klass) \
OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE)
-/* PC-style peripherals (also used by other machines). */
-
-#define ACPI_PM_PROP_S3_DISABLED "disable_s3"
-#define ACPI_PM_PROP_S4_DISABLED "disable_s4"
-#define ACPI_PM_PROP_S4_VAL "s4_val"
-#define ACPI_PM_PROP_SCI_INT "sci_int"
-#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd"
-#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd"
-#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base"
-#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk"
-#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len"
-#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
-
/* parallel.c */
void parallel_hds_isa_init(ISABus *bus, int n);
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index cd0a1d357b..eb9b76f70b 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -21,7 +21,6 @@
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "hw/hw.h"
-#include "hw/i386/pc.h"
#include "hw/acpi/acpi.h"
#include "hw/nvram/fw_cfg.h"
#include "qemu/config-file.h"
--
2.15.0.rc0
- [Qemu-devel] [PATCH v2 18/39] numa: remove unused #include, (continued)
- [Qemu-devel] [PATCH v2 18/39] numa: remove unused #include, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 19/39] hw/ssi/aspeed_smc: remove unused #include, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 20/39] amd_iommu: avoid needless includes in header file, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 21/39] misc: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 22/39] hw/ide: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 23/39] hw/ipmi: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 24/39] hw/i2c: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 25/39] hw/tpm: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 26/39] hw/virtio-balloon: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 27/39] hw/unicore32: restrict hw addr defines to source file, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 28/39] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 29/39] hw/timer/i8254: rename pit_init() -> i8254_pit_init(), Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 30/39] hw/display/vga: remove the old i386/pc dependency, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 31/39] hw/input/i8042: extract pckbd and vmmouse API from hw/i386/pc.h, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 32/39] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init(), Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 34/39] misc: drop old i386 dependency, Philippe Mathieu-Daudé, 2017/10/16
- [Qemu-devel] [PATCH v2 33/39] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c, Philippe Mathieu-Daudé, 2017/10/16