On Tue, May 20, 2014 at 05:15:21PM +0200, Igor Mammedov wrote:
> to make it more generic, so it could be used for memory hotplug
> as well.
>
> Signed-off-by: Igor Mammedov <imamm...@redhat.com>
These are actually qemu pc specific hotplug registers,
this name makes one think these are generic defines.
How about ./include/hw/acpi/pc-hotplug.h ?
> ---
> hw/i386/acpi-dsdt.dsl | 2 +-
> hw/i386/q35-acpi-dsdt.dsl | 2 +-
> include/hw/acpi/acpi_defs.h | 33 +++++++++++++++++++++++++++++++++
> include/hw/acpi/cpu_hotplug.h | 2 +-
> include/hw/acpi/cpu_hotplug_defs.h | 33 ---------------------------------
> 5 files changed, 36 insertions(+), 36 deletions(-)
> create mode 100644 include/hw/acpi/acpi_defs.h
> delete mode 100644 include/hw/acpi/cpu_hotplug_defs.h
>
> diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl
> index 0a1e252..f93353f 100644
> --- a/hw/i386/acpi-dsdt.dsl
> +++ b/hw/i386/acpi-dsdt.dsl
> @@ -306,7 +306,7 @@ DefinitionBlock (
> }
> }
>
> -#include "hw/acpi/cpu_hotplug_defs.h"
> +#include "hw/acpi/acpi_defs.h"
> #define CPU_STATUS_BASE PIIX4_CPU_HOTPLUG_IO_BASE
> #include "acpi-dsdt-cpu-hotplug.dsl"
>
> diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl
> index f4d2a2d..3838fc7 100644
> --- a/hw/i386/q35-acpi-dsdt.dsl
> +++ b/hw/i386/q35-acpi-dsdt.dsl
> @@ -402,7 +402,7 @@ DefinitionBlock (
> define_gsi_link(GSIH, 0, 0x17)
> }
>
> -#include "hw/acpi/cpu_hotplug_defs.h"
> +#include "hw/acpi/acpi_defs.h"
> #define CPU_STATUS_BASE ICH9_CPU_HOTPLUG_IO_BASE
> #include "acpi-dsdt-cpu-hotplug.dsl"
>
> diff --git a/include/hw/acpi/acpi_defs.h b/include/hw/acpi/acpi_defs.h
> new file mode 100644
> index 0000000..0692b3b
> --- /dev/null
> +++ b/include/hw/acpi/acpi_defs.h
> @@ -0,0 +1,33 @@
> +/*
> + * QEMU ACPI hotplug utilities shared defines
> + *
> + * Copyright (C) 2014 Red Hat Inc
> + *
> + * Authors:
> + * Igor Mammedov <imamm...@redhat.com>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +#ifndef ACPI_DEFS_H
> +#define ACPI_DEFS_H
> +
> +/*
> + * ONLY DEFINEs are permited in this file since it's shared
> + * between C and ASL code.
> + */
> +#define ACPI_CPU_HOTPLUG_STATUS 4
> +
> +/* Limit for CPU arch IDs for CPU hotplug. All hotpluggable CPUs should
> + * have CPUClass.get_arch_id() < ACPI_CPU_HOTPLUG_ID_LIMIT.
> + */
> +#define ACPI_CPU_HOTPLUG_ID_LIMIT 256
> +
> +/* 256 CPU IDs, 8 bits per entry: */
> +#define ACPI_GPE_PROC_LEN 32
> +
> +#define ICH9_CPU_HOTPLUG_IO_BASE 0x0CD8
> +#define PIIX4_CPU_HOTPLUG_IO_BASE 0xaf00
> +#define ACPI_CPU_HOTPLUG_BASE_PROP "cpu-hotplug-io-base"
> +
> +#endif
> diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
> index 4576400..1562ce8 100644
> --- a/include/hw/acpi/cpu_hotplug.h
> +++ b/include/hw/acpi/cpu_hotplug.h
> @@ -13,7 +13,7 @@
> #define ACPI_HOTPLUG_H
>
> #include "hw/acpi/acpi.h"
> -#include "hw/acpi/cpu_hotplug_defs.h"
> +#include "hw/acpi/acpi_defs.h"
>
> typedef struct AcpiCpuHotplug {
> MemoryRegion io;
> diff --git a/include/hw/acpi/cpu_hotplug_defs.h
> b/include/hw/acpi/cpu_hotplug_defs.h
> deleted file mode 100644
> index ce41e4c..0000000
> --- a/include/hw/acpi/cpu_hotplug_defs.h
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -/*
> - * QEMU ACPI hotplug utilities shared defines
> - *
> - * Copyright (C) 2013 Red Hat Inc
> - *
> - * Authors:
> - * Igor Mammedov <imamm...@redhat.com>
> - *
> - * This work is licensed under the terms of the GNU GPL, version 2 or later.
> - * See the COPYING file in the top-level directory.
> - */
> -#ifndef ACPI_HOTPLUG_DEFS_H
> -#define ACPI_HOTPLUG_DEFS_H
> -
> -/*
> - * ONLY DEFINEs are permited in this file since it's shared
> - * between C and ASL code.
> - */
> -#define ACPI_CPU_HOTPLUG_STATUS 4
> -
> -/* Limit for CPU arch IDs for CPU hotplug. All hotpluggable CPUs should
> - * have CPUClass.get_arch_id() < ACPI_CPU_HOTPLUG_ID_LIMIT.
> - */
> -#define ACPI_CPU_HOTPLUG_ID_LIMIT 256
> -
> -/* 256 CPU IDs, 8 bits per entry: */
> -#define ACPI_GPE_PROC_LEN 32
> -
> -#define ICH9_CPU_HOTPLUG_IO_BASE 0x0CD8
> -#define PIIX4_CPU_HOTPLUG_IO_BASE 0xaf00
> -#define ACPI_CPU_HOTPLUG_BASE_PROP "cpu-hotplug-io-base"
> -
> -#endif
> --
> 1.7.1
