[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/25] pc: acpi: cpu-hotplug: make AML CPU_foo define
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 07/25] pc: acpi: cpu-hotplug: make AML CPU_foo defines local to cpu_hotplug_acpi_table.c |
Date: |
Sun, 5 Jun 2016 16:21:13 +0300 |
From: Igor Mammedov <address@hidden>
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 <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
---
include/hw/acpi/cpu_hotplug.h | 7 -------
hw/acpi/cpu_hotplug_acpi_table.c | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
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
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)
{
--
MST
- [Qemu-devel] [PULL 00/25] pc, pci, virtio: new features, cleanups, fixes, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 02/25] acpi: add aml_debug(), Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 03/25] acpi: add aml_refof(), Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 01/25] tests: acpi: report names of expected files in verbose mode, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 04/25] pc: acpi: remove AML for empty/not used GPE handlers, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 05/25] pc: acpi: consolidate CPU hotplug AML, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 07/25] pc: acpi: cpu-hotplug: make AML CPU_foo defines local to cpu_hotplug_acpi_table.c,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 06/25] pc: acpi: consolidate \GPE._E02 with the rest of CPU hotplug AML, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 10/25] pc: acpi: simplify build_legacy_cpu_hotplug_aml() signature, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 08/25] pc: acpi: mark current CPU hotplug functions as legacy, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 09/25] pc: acpi: consolidate legacy CPU hotplug in one file, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 11/25] pc: acpi: cpuhp-legacy: switch ProcessorID to possible_cpus idx, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 12/25] tests: acpi: update tables with consolidated legacy cpu-hotplug AML, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 13/25] ipmi: rework the fwinfo to be fetched from the interface, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 14/25] pc: Postpone SMBIOS table installation to post machine init, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 15/25] acpi: extend ACPI interface to provide send_event hook, Michael S. Tsirkin, 2016/06/05
- [Qemu-devel] [PULL 16/25] pc: use AcpiDeviceIfClass.send_event to issue GPE events, Michael S. Tsirkin, 2016/06/05