From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Tue, 17 Oct 2017 16:44:18 +0000 (-0300)
Subject: hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc
X-Git-Tag: v2.12.0-rc0~189^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1c439d1794a86536bf5f47d9823ff156a7d7433;p=thirdparty%2Fqemu.git

hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc

enable_tco is specific to i386/pc.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index a352c94fdee..59aeb063931 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -63,6 +63,8 @@ typedef struct ICH9LPCPMRegs {
     TCOIORegs tco_regs;
 } ICH9LPCPMRegs;
 
+#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
+
 void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
                   bool smm_enabled,
                   qemu_irq sci_irq);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 252526e600b..3794473108d 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -151,8 +151,6 @@ struct PCMachineClass {
 #define PC_MACHINE_CLASS(klass) \
     OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE)
 
-#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
-
 /* parallel.c */
 
 void parallel_hds_isa_init(ISABus *bus, int n);