qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org, Anthony Liguori <anthony@codemonkey.ws>
Cc: pbonzini@redhat.com, imammedo@redhat.com, afaerber@suse.de,
	kraxel@redhat.com
Subject: [Qemu-devel] [PATCH v7 19/26] acpi/piix: add macros for acpi property names
Date: Thu, 3 Oct 2013 16:22:07 +0300	[thread overview]
Message-ID: <1380806439-32587-20-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1380806439-32587-1-git-send-email-mst@redhat.com>

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 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

  parent reply	other threads:[~2013-10-03 13:20 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-03 13:20 [Qemu-devel] [PATCH v7 00/26] qemu: generate acpi tables for the guest Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 01/26] cleanup object.h: include error.h directly Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 02/26] qom: cleanup struct Error references Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 03/26] qom: add pointer to int property helpers Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 04/26] pci: fix up w64 size calculation helper Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 05/26] fw_cfg: interface to trigger callback on read Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 06/26] loader: support for unmapped ROM blobs Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 07/26] pcie_host: expose UNMAPPED macro Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 08/26] pcie_host: expose address format Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 09/26] q35: use macro for MCFG property name Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 10/26] q35: expose mmcfg size as a property Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 11/26] i386: add ACPI table files from seabios Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 12/26] acpi: add rules to compile ASL source Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 13/26] acpi: pre-compiled ASL files Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 14/26] acpi: ssdt pcihp: updat generated file Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 15/26] loader: use file path size from fw_cfg.h Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 16/26] i386: add bios linker/loader Michael S. Tsirkin
2013-10-03 13:21 ` [Qemu-devel] [PATCH v7 17/26] loader: allow adding ROMs in done callbacks Michael S. Tsirkin
2013-10-03 13:22 ` [Qemu-devel] [PATCH v7 18/26] i386: define pc guest info Michael S. Tsirkin
2013-10-03 13:22 ` Michael S. Tsirkin [this message]
2013-10-03 13:22 ` [Qemu-devel] [PATCH v7 20/26] piix: APIs for " Michael S. Tsirkin
2013-10-03 13:22 ` [Qemu-devel] [PATCH v7 21/26] ich9: " Michael S. Tsirkin
2013-10-03 13:22 ` [Qemu-devel] [PATCH v7 22/26] pvpanic: add API to access io port Michael S. Tsirkin
2013-10-03 13:22 ` [Qemu-devel] [PATCH v7 23/26] hpet: add API to find it Michael S. Tsirkin
2013-10-03 13:22 ` [Qemu-devel] [PATCH v7 24/26] i386: ACPI table generation code from seabios Michael S. Tsirkin
2013-10-03 13:22 ` [Qemu-devel] [PATCH v7 25/26] ssdt: fix PBLK length Michael S. Tsirkin
2013-10-03 13:22 ` [Qemu-devel] [PATCH v7 26/26] ssdt-proc: update generated file Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1380806439-32587-20-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=afaerber@suse.de \
    --cc=anthony@codemonkey.ws \
    --cc=imammedo@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).