aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2016-05-17 16:42:59 +0200
committerMichael S. Tsirkin <mst@redhat.com>2016-06-07 15:36:54 +0300
commita630bb314c1f3108f391d19e1a20e07ea3c9edd2 (patch)
tree4fa49a16ce8f828c5b0b663004a83deae003db29
parent8edf77e497deb35024a6318a7f568d1e117bdb49 (diff)
downloadqemu-a630bb314c1f3108f391d19e1a20e07ea3c9edd2.zip
qemu-a630bb314c1f3108f391d19e1a20e07ea3c9edd2.tar.gz
qemu-a630bb314c1f3108f391d19e1a20e07ea3c9edd2.tar.bz2
pc: acpi: cpu-hotplug: make AML CPU_foo defines local to cpu_hotplug_acpi_table.c
now as those defines are used only locally inside of cpu_hotplug_acpi_table.c, move them out of header file. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
-rw-r--r--hw/acpi/cpu_hotplug_acpi_table.c7
-rw-r--r--include/hw/acpi/cpu_hotplug.h7
2 files changed, 7 insertions, 7 deletions
diff --git a/hw/acpi/cpu_hotplug_acpi_table.c b/hw/acpi/cpu_hotplug_acpi_table.c
index c31f346..9fdde6d 100644
--- a/hw/acpi/cpu_hotplug_acpi_table.c
+++ b/hw/acpi/cpu_hotplug_acpi_table.c
@@ -17,6 +17,13 @@
#include "hw/acpi/cpu_hotplug.h"
#include "hw/i386/pc.h"
+#define CPU_EJECT_METHOD "CPEJ"
+#define CPU_MAT_METHOD "CPMA"
+#define CPU_ON_BITMAP "CPON"
+#define CPU_STATUS_METHOD "CPST"
+#define CPU_STATUS_MAP "PRS"
+#define CPU_SCAN_METHOD "PRSC"
+
void build_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
uint16_t io_base, uint16_t io_len)
{
diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
index 9b1d0cf..565f96c 100644
--- a/include/hw/acpi/cpu_hotplug.h
+++ b/include/hw/acpi/cpu_hotplug.h
@@ -27,13 +27,6 @@ void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
void acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
AcpiCpuHotplug *gpe_cpu, uint16_t base);
-#define CPU_EJECT_METHOD "CPEJ"
-#define CPU_MAT_METHOD "CPMA"
-#define CPU_ON_BITMAP "CPON"
-#define CPU_STATUS_METHOD "CPST"
-#define CPU_STATUS_MAP "PRS"
-#define CPU_SCAN_METHOD "PRSC"
-
void build_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
uint16_t io_base, uint16_t io_len);
#endif