From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: mst@redhat.com, ehabkost@redhat.com, marcel@redhat.com,
eblake@redhat.com, armbru@redhat.com, drjones@redhat.com
Subject: [Qemu-devel] [RFC 06/42] pc: acpi: cpu-hotplug: make AML CPU_foo defines local to cpu_hotplug_acpi_table.c
Date: Mon, 2 May 2016 14:33:15 +0200 [thread overview]
Message-ID: <1462192431-146342-7-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1462192431-146342-1-git-send-email-imammedo@redhat.com>
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>
---
hw/acpi/cpu_hotplug_acpi_table.c | 7 +++++++
include/hw/acpi/cpu_hotplug.h | 7 -------
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
--
1.8.3.1
next prev parent reply other threads:[~2016-05-02 12:34 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 12:33 [Qemu-devel] [RFC 00/42] ACPI CPU hotplug refactoring to support more than 255 CPUs and PXM/OST methods Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 01/42] acpi: add aml_debug() Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 02/42] acpi: add aml_refof() Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 03/42] pc: acpi: remove AML for empty/not used GPE handlers Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 04/42] pc: acpi: consolidate CPU hotplug AML Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 05/42] pc: acpi: consolidate \GPE._E02 with the rest of " Igor Mammedov
2016-05-02 12:33 ` Igor Mammedov [this message]
2016-05-02 12:33 ` [Qemu-devel] [RFC 07/42] pc: acpi: mark current CPU hotplug functions as legacy Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 08/42] pc: acpi: consolidate legacy CPU hotplug in one file Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 09/42] pc: acpi: simplify build_legacy_cpu_hotplug_aml() signature Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 10/42] pc: piix4/ich9: add 'cpu-hotplug-legacy' property Igor Mammedov
2016-05-10 20:19 ` Eduardo Habkost
2016-05-11 13:33 ` Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 11/42] pc: add 2.7 machine Igor Mammedov
2016-05-10 20:20 ` Eduardo Habkost
2016-05-02 12:33 ` [Qemu-devel] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types Igor Mammedov
2016-05-10 20:24 ` Eduardo Habkost
2016-05-11 13:50 ` Igor Mammedov
2016-05-11 21:51 ` Michael S. Tsirkin
2016-05-11 23:28 ` Eduardo Habkost
2016-05-12 7:07 ` Michael S. Tsirkin
2016-05-12 10:29 ` Igor Mammedov
2016-05-12 10:52 ` Eduardo Habkost
2016-05-12 11:04 ` [Qemu-devel] [libvirt] " Peter Krempa
2016-05-12 13:20 ` Igor Mammedov
2016-05-12 13:27 ` Peter Krempa
2016-05-12 14:30 ` Igor Mammedov
2016-05-11 23:36 ` [Qemu-devel] " Eduardo Habkost
2016-05-12 7:05 ` Michael S. Tsirkin
2016-05-12 10:39 ` Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 13/42] tests: bios-tables-test: update tables with CPHP turned off by default Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 14/42] tests: acpi: check legacy CPU hotplug AML is present for 2.6 machine type Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 15/42] acpi: extend ACPI interface to provide send_event hook Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 16/42] pc: use AcpiDeviceIfClass.send_event to issue GPE events Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 17/42] docs: update ACPI CPU hotplug spec with new protocol Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 18/42] acpi: hardware side of CPU hotplug Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 19/42] pc: add generic CPU unplug callbacks Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 20/42] machine: add cpu-hotplug machine option Igor Mammedov
2016-05-10 20:27 ` Eduardo Habkost
2016-05-11 14:00 ` Igor Mammedov
2016-05-11 15:00 ` Eduardo Habkost
2016-05-02 12:33 ` [Qemu-devel] [RFC 21/42] pc: q35: initialize new CPU hotplug hw Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 22/42] pc: piix4: " Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 23/42] tests: pc-cpu-test: turn on cpu-hotplug explicily Igor Mammedov
2016-05-10 20:28 ` Eduardo Habkost
2016-05-02 12:33 ` [Qemu-devel] [RFC 24/42] pc: acpi: cpuhp-legacy: switch ProcessorID to possible_cpus idx Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 25/42] tests: acpi: update cphp_legacy case with new ProcessorID values Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 26/42] pc: acpi: introduce AcpiDeviceIfClass.madt_cpu hook Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 27/42] acpi: add CPU devices AML to DSDT Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 28/42] acpi: add CPU hotplug methods " Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 29/42] tests: acpi: update expected files with new CPU AML description Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 30/42] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 31/42] pc: numa: replace node_cpu indexing by apic_id with possible_cpus index Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 32/42] pc: set X86CPU.node property if QEMU starts with numa enabled Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 33/42] target-i386: add X86CPU.node property Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 34/42] acpi: cpuhp: add command and data registers Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 35/42] acpi: cpuhp: provide cpu._PXM method if running in numa mode Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 36/42] acpi: cpuhp: add cpu._OST handling Igor Mammedov
2016-05-10 21:07 ` Eric Blake
2016-05-11 14:02 ` Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 37/42] tests: acpi: report names of expected files in verbose mode Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 38/42] tests: acpi: add CPU hotplug testcase Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 39/42] tests: acpi: add expected tables for CPU hotplug case Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 40/42] tests: acpi: extend CPU hotplug test with NUMA support Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 41/42] tests: acpi: cpuhp: add expected SRAT tables and update DSDT with _PXM support Igor Mammedov
2016-05-02 12:33 ` [Qemu-devel] [RFC 42/42] DO NOT APPLY: simulate CPU unplug when executin cpu-add on a present CPU Igor Mammedov
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=1462192431-146342-7-git-send-email-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=armbru@redhat.com \
--cc=drjones@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=marcel@redhat.com \
--cc=mst@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).