Re: [Qemu-devel] [PATCH 07/33] pc: acpi: cpu-hotplug: make AML CPU_foo defines local to cpu_hotplug_acpi_table.c

[Marcel Apfelbaum]

On 05/17/2016 05:42 PM, Igor Mammedov wrote:
> 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>
> ---
>   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

Reviewed-by: Marcel Apfelbaum <address@hidden>

Thanks,
Marcel