[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/43] acpi/piix: add macros for acpi property names
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 30/43] acpi/piix: add macros for acpi property names |
Date: |
Mon, 14 Oct 2013 18:00:07 +0300 |
Reviewed-by: Gerd Hoffmann <address@hidden>
Tested-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/pc.h | 10 ++++++++++
hw/acpi/piix4.c | 6 +++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 085a621..5aefc5b 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -20,6 +20,16 @@ typedef struct PcPciInfo {
Range w64;
} PcPciInfo;
+#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"
+
struct PcGuestInfo {
bool has_pci_info;
bool isapc_ram_fw;
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index b46bd5e..4b8c1da 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -489,9 +489,9 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t
smb_io_base,
static Property piix4_pm_properties[] = {
DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0),
- DEFINE_PROP_UINT8("disable_s3", PIIX4PMState, disable_s3, 0),
- DEFINE_PROP_UINT8("disable_s4", PIIX4PMState, disable_s4, 0),
- DEFINE_PROP_UINT8("s4_val", PIIX4PMState, s4_val, 2),
+ DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, 0),
+ DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 0),
+ DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2),
DEFINE_PROP_END_OF_LIST(),
};
--
MST
- [Qemu-devel] [PULL 21/43] q35: expose mmcfg size as a property, (continued)
- [Qemu-devel] [PULL 21/43] q35: expose mmcfg size as a property, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 23/43] acpi: add rules to compile ASL source, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 25/43] acpi: ssdt pcihp: updat generated file, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 22/43] i386: add ACPI table files from seabios, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 26/43] loader: use file path size from fw_cfg.h, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 24/43] acpi: pre-compiled ASL files, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 27/43] i386: add bios linker/loader, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 28/43] loader: allow adding ROMs in done callbacks, Michael S. Tsirkin, 2013/10/14
- Re: [Qemu-devel] [PULL 00/43] pci, pc, acpi fixes, enhancements, Paolo Bonzini, 2013/10/14
- [Qemu-devel] [PULL 29/43] i386: define pc guest info, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 30/43] acpi/piix: add macros for acpi property names,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 31/43] piix: APIs for pc guest info, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 32/43] ich9: APIs for pc guest info, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 33/43] pvpanic: add API to access io port, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 34/43] hpet: add API to find it, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 35/43] acpi: add interface to access user-installed tables, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 36/43] pc: use new api to add builtin tables, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 37/43] i386: ACPI table generation code from seabios, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 38/43] ssdt: fix PBLK length, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 39/43] ssdt-proc: update generated file, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 40/43] pci: add pci_for_each_bus_depth_first, Michael S. Tsirkin, 2013/10/14