[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 52/61] hw/acpi: ACPI_PM_* defines are not restricte
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 52/61] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch |
Date: |
Mon, 18 Dec 2017 00:27:57 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
this allows to remove the old i386/pc dependency on acpi/core.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
hw/acpi/core.c | 1 -
include/hw/acpi/acpi.h | 11 +++++++++++
include/hw/i386/pc.h | 11 -----------
3 files changed, 11 insertions(+), 12 deletions(-)
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"
diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index 7b3d93cf0d..39ff512129 100644
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -39,6 +39,17 @@
#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"
+
/* 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 ef438bd765..252526e600 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -151,17 +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 */
--
2.11.0
- [Qemu-trivial] [PULL 00/61] Trivial patches for 2017-12-18, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 05/61] qht: fix kernel-doc markup in qht.h, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 39/61] hw/input/vmmouse: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 30/61] block: remove "qemu/osdep.h" from header file, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 59/61] i386/pc: move vmport.c to hw/i386/, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 55/61] hw/display/vga: "vga_int.h" requires "ui/console.h", Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 52/61] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch,
Michael Tokarev <=
- [Qemu-trivial] [PULL 15/61] MAINTAINERS: add "hw/registerfields.h" in Register API entry, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 01/61] Remove empty statements, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 13/61] accel/tcg/cpu-exec-common.c: Remove unnecessary include of memory-internal.h, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 07/61] mmap(2) returns MAP_FAILED, not NULL, on failure, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 02/61] hw/alpha/typhoon: simplify using the "unimplemented" sysbus device, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 47/61] hw/tpm: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 04/61] translate-all: fix 'consisits' typo in comment, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 40/61] hw/misc/pvpanic: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 36/61] nios2: remove duplicated includes (in code commented out), Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 08/61] .gitignore: remove vscclient, Michael Tokarev, 2017/12/17