| Message ID | 20240607115649.214622-3-salil.mehta@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add architecture agnostic code to support vCPU Hotplug | expand |
On Fri, 7 Jun 2024 12:56:43 +0100 Salil Mehta <salil.mehta@huawei.com> wrote: > CPU ctrl-dev MMIO region length could be used in ACPI GED and various other > architecture specific places. Move ACPI_CPU_HOTPLUG_REG_LEN macro to more > appropriate common header file. > > Signed-off-by: Salil Mehta <salil.mehta@huawei.com> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Reviewed-by: Gavin Shan <gshan@redhat.com> > Reviewed-by: David Hildenbrand <david@redhat.com> > Reviewed-by: Shaoqin Huang <shahuang@redhat.com> > Tested-by: Vishnu Pajjuri <vishnu@os.amperecomputing.com> > Tested-by: Xianglai Li <lixianglai@loongson.cn> > Tested-by: Miguel Luis <miguel.luis@oracle.com> > Tested-by: Zhao Liu <zhao1.liu@intel.com> > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> > --- > hw/acpi/cpu.c | 2 +- > include/hw/acpi/cpu_hotplug.h | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c > index 2d81c1e790..69aaa563db 100644 > --- a/hw/acpi/cpu.c > +++ b/hw/acpi/cpu.c > @@ -1,13 +1,13 @@ > #include "qemu/osdep.h" > #include "migration/vmstate.h" > #include "hw/acpi/cpu.h" > +#include "hw/acpi/cpu_hotplug.h" > #include "hw/core/cpu.h" > #include "qapi/error.h" > #include "qapi/qapi-events-acpi.h" > #include "trace.h" > #include "sysemu/numa.h" > > -#define ACPI_CPU_HOTPLUG_REG_LEN 12 > #define ACPI_CPU_SELECTOR_OFFSET_WR 0 > #define ACPI_CPU_FLAGS_OFFSET_RW 4 > #define ACPI_CPU_CMD_OFFSET_WR 5 > diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h > index 3b932abbbb..48b291e45e 100644 > --- a/include/hw/acpi/cpu_hotplug.h > +++ b/include/hw/acpi/cpu_hotplug.h this file has deps on x86 machine and contains mainly legacy CPU hotplug API for x86. > @@ -19,6 +19,8 @@ > #include "hw/hotplug.h" > #include "hw/acpi/cpu.h" > > +#define ACPI_CPU_HOTPLUG_REG_LEN 12 the better place for it would be include/hw/acpi/cpu.h > typedef struct AcpiCpuHotplug { > Object *device; > MemoryRegion io;
Hi Igor, On 06/07/2024 13:20, Igor Mammedov wrote: > On Fri, 7 Jun 2024 12:56:43 +0100 > Salil Mehta <salil.mehta@huawei.com> wrote: > >> CPU ctrl-dev MMIO region length could be used in ACPI GED and various other >> architecture specific places. Move ACPI_CPU_HOTPLUG_REG_LEN macro to more >> appropriate common header file. >> >> Signed-off-by: Salil Mehta <salil.mehta@huawei.com> >> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> >> Reviewed-by: Gavin Shan <gshan@redhat.com> >> Reviewed-by: David Hildenbrand <david@redhat.com> >> Reviewed-by: Shaoqin Huang <shahuang@redhat.com> >> Tested-by: Vishnu Pajjuri <vishnu@os.amperecomputing.com> >> Tested-by: Xianglai Li <lixianglai@loongson.cn> >> Tested-by: Miguel Luis <miguel.luis@oracle.com> >> Tested-by: Zhao Liu <zhao1.liu@intel.com> >> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> >> --- >> hw/acpi/cpu.c | 2 +- >> include/hw/acpi/cpu_hotplug.h | 2 ++ >> 2 files changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c >> index 2d81c1e790..69aaa563db 100644 >> --- a/hw/acpi/cpu.c >> +++ b/hw/acpi/cpu.c >> @@ -1,13 +1,13 @@ >> #include "qemu/osdep.h" >> #include "migration/vmstate.h" >> #include "hw/acpi/cpu.h" >> +#include "hw/acpi/cpu_hotplug.h" >> #include "hw/core/cpu.h" >> #include "qapi/error.h" >> #include "qapi/qapi-events-acpi.h" >> #include "trace.h" >> #include "sysemu/numa.h" >> >> -#define ACPI_CPU_HOTPLUG_REG_LEN 12 >> #define ACPI_CPU_SELECTOR_OFFSET_WR 0 >> #define ACPI_CPU_FLAGS_OFFSET_RW 4 >> #define ACPI_CPU_CMD_OFFSET_WR 5 >> diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h >> index 3b932abbbb..48b291e45e 100644 >> --- a/include/hw/acpi/cpu_hotplug.h >> +++ b/include/hw/acpi/cpu_hotplug.h > this file has deps on x86 machine and contains mainly > legacy CPU hotplug API for x86. sure. > >> @@ -19,6 +19,8 @@ >> #include "hw/hotplug.h" >> #include "hw/acpi/cpu.h" >> >> +#define ACPI_CPU_HOTPLUG_REG_LEN 12 > the better place for it would be include/hw/acpi/cpu.h ok. Thanks Salil. > >> typedef struct AcpiCpuHotplug { >> Object *device; >> MemoryRegion io;
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 2d81c1e790..69aaa563db 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -1,13 +1,13 @@ #include "qemu/osdep.h" #include "migration/vmstate.h" #include "hw/acpi/cpu.h" +#include "hw/acpi/cpu_hotplug.h" #include "hw/core/cpu.h" #include "qapi/error.h" #include "qapi/qapi-events-acpi.h" #include "trace.h" #include "sysemu/numa.h" -#define ACPI_CPU_HOTPLUG_REG_LEN 12 #define ACPI_CPU_SELECTOR_OFFSET_WR 0 #define ACPI_CPU_FLAGS_OFFSET_RW 4 #define ACPI_CPU_CMD_OFFSET_WR 5 diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 3b932abbbb..48b291e45e 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -19,6 +19,8 @@ #include "hw/hotplug.h" #include "hw/acpi/cpu.h" +#define ACPI_CPU_HOTPLUG_REG_LEN 12 + typedef struct AcpiCpuHotplug { Object *device; MemoryRegion io;