53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
|
From fd6e7e7278e1c0fb08e0a09d9e22157e11b36ece Mon Sep 17 00:00:00 2001
|
||
|
|
From: Salil Mehta <salil.mehta@huawei.com>
|
||
|
|
Date: Sun, 20 Aug 2023 17:11:04 +0000
|
||
|
|
Subject: [PATCH] hw/acpi: Move CPU ctrl-dev MMIO region len macro to common
|
||
|
|
header file
|
||
|
|
|
||
|
|
CPU ctrl-dev MMIO region length could be used in ACPI GED (common ACPI code
|
||
|
|
across architectures) and various other architecture specific places. To make
|
||
|
|
these code places independent of compilation order, ACPI_CPU_HOTPLUG_REG_LEN
|
||
|
|
macro should be moved to a header file.
|
||
|
|
|
||
|
|
Signed-off-by: Salil Mehta <salil.mehta@huawei.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 011d2c6c2d..4b24a25003 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;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|