From 4fef4ae9f3fb3f884d5eee74d3cc2272bff900f8 Mon Sep 17 00:00:00 2001 Message-Id: <4fef4ae9f3fb3f884d5eee74d3cc2272bff900f8.1387298827.git.minovotn@redhat.com> In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> From: "Michael S. Tsirkin" Date: Tue, 17 Dec 2013 15:18:47 +0100 Subject: [PATCH 40/56] acpi/piix: add macros for acpi property names RH-Author: Michael S. Tsirkin Message-id: <1387293161-4085-41-git-send-email-mst@redhat.com> Patchwork-id: 56346 O-Subject: [PATCH qemu-kvm RHEL7.0 v2 40/57] acpi/piix: add macros for acpi property names Bugzilla: 1034876 RH-Acked-by: Igor Mammedov RH-Acked-by: Marcel Apfelbaum RH-Acked-by: Laszlo Ersek Reviewed-by: Gerd Hoffmann Tested-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Tested-by: Igor Mammedov Signed-off-by: Michael S. Tsirkin (cherry picked from commit f854ecc79957e588bed8ed7e8c1c24ded55fc1e9) Conflicts: hw/acpi/piix4.c --- include/hw/i386/pc.h | 10 ++++++++++ hw/acpi/piix4.c | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) Signed-off-by: Michal Novotny --- hw/acpi/piix4.c | 6 +++--- include/hw/i386/pc.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 6882937..18b1300 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -475,9 +475,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, 1), - DEFINE_PROP_UINT8("disable_s4", PIIX4PMState, disable_s4, 1), - DEFINE_PROP_UINT8("s4_val", PIIX4PMState, s4_val, 2), + DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, 1), + DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 1), + DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ec91fae..5011c87 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -22,6 +22,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; hwaddr ram_size; -- 1.7.11.7