From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmmXB-0004DS-NV for qemu-devel@nongnu.org; Tue, 20 May 2014 12:05:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmmX5-0001jZ-Hj for qemu-devel@nongnu.org; Tue, 20 May 2014 12:04:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmmX5-0001jT-AW for qemu-devel@nongnu.org; Tue, 20 May 2014 12:04:51 -0400 Date: Tue, 20 May 2014 18:03:28 +0200 From: Igor Mammedov Message-ID: <20140520180328.7816eb0c@nial.usersys.redhat.com> In-Reply-To: <20140520153533.GA13420@redhat.com> References: <1400598934-31921-1-git-send-email-imammedo@redhat.com> <1400598934-31921-19-git-send-email-imammedo@redhat.com> <20140520153533.GA13420@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 18/31] acpi: rename cpu_hotplug_defs.h to acpi_defs.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: peter.maydell@linaro.org, alex@alex.org.uk, aik@ozlabs.ru, hutao@cn.fujitsu.com, mjt@tls.msk.ru, qemu-devel@nongnu.org, agraf@suse.de, kraxel@redhat.com, pasteka@kabsi.at, s.priebe@profihost.ag, agarcia@igalia.com, armbru@redhat.com, aliguori@amazon.com, david@gibson.dropbear.id.au, lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, tangchen@cn.fujitsu.com, rth@twiddle.net, andrey@xdel.ru, vasilis.liaskovitis@profitbricks.com, pbonzini@redhat.com, afaerber@suse.de, aurelien@aurel32.net On Tue, 20 May 2014 18:35:33 +0300 "Michael S. Tsirkin" wrote: > 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 > > 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 ? sure > > > --- > > 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 > > + * > > + * 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 > > - * > > - * 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