[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/34] hw/acpi: ACPI_PM_* defines are not restricted
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 19/34] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch |
Date: |
Fri, 22 Sep 2017 12:39:59 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
include/hw/acpi/acpi.h | 12 ++++++++++++
include/hw/i386/pc.h | 13 -------------
2 files changed, 12 insertions(+), 13 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);
--
2.14.1
- [Qemu-devel] [PATCH 14/34] hw/ipmi: remove old i386 dependency, (continued)
- [Qemu-devel] [PATCH 14/34] hw/ipmi: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-devel] [PATCH 15/34] hw/i2c: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-devel] [PATCH 16/34] hw/tpm: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-devel] [PATCH 17/34] hw/virtio-balloon: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-devel] [PATCH 18/34] hw/unicore32: restrict hw addr defines to source file, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-devel] [PATCH 19/34] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 20/34] hw/timer/i8254: rename pit_init() -> i8254_pit_init(), Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-devel] [PATCH 22/34] hw/input/i8042: extract API from hw/i386/pc.h, Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-devel] [PATCH 23/34] hw/dma/i8257: rename DMA_init() to i8257_dma_init(), Philippe Mathieu-Daudé, 2017/09/22
- [Qemu-devel] [PATCH 25/34] hw/timer/m48t59: use TYPE_M48T59_ISA, add entries to MAINTAINERS, Philippe Mathieu-Daudé, 2017/09/22