From 79442cbc960b7695d7d0f8a17004b904ac91db4a Mon Sep 17 00:00:00 2001 From: Fei Li Date: Thu, 28 Apr 2022 11:04:27 +0800 Subject: [PATCH] dm: acpi: refine CPU Definition Blocks name For all Definition Blocks in ACPI Namespace, their name are a fixed 32 bits. This patch refine CPU Definition Blocks name to support more than 10 CPUs for a guest. Tracked-On: #7387 Signed-off-by: Fei Li --- devicemodel/hw/platform/acpi/acpi_pm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/devicemodel/hw/platform/acpi/acpi_pm.c b/devicemodel/hw/platform/acpi/acpi_pm.c index c1e9c7391..5d953717f 100644 --- a/devicemodel/hw/platform/acpi/acpi_pm.c +++ b/devicemodel/hw/platform/acpi/acpi_pm.c @@ -323,10 +323,10 @@ void pm_write_dsdt(struct vmctx *ctx, int ncpu) /* Scope (_PR) */ dsdt_line(""); - dsdt_line(" Scope (_PR)"); + dsdt_line(" Scope (_SB)"); dsdt_line(" {"); for (i = 0; i < ncpu; i++) { - dsdt_line(" Device (CPU%d)", i); + dsdt_line(" Device (PR%02d)", i); dsdt_line(" {"); dsdt_line(" Name (_HID, \"ACPI0007\")"); dsdt_line(" Name (_UID, 0x%02X)", i); @@ -337,7 +337,7 @@ void pm_write_dsdt(struct vmctx *ctx, int ncpu) /* Scope (_PR.CPU(N)) */ for (i = 0; i < ncpu; i++) { - dsdt_line(" Scope (_PR.CPU%d)", i); + dsdt_line(" Scope (_SB.PR%02d)", i); dsdt_line(" {"); dsdt_line(""); @@ -353,12 +353,12 @@ void pm_write_dsdt(struct vmctx *ctx, int ncpu) } else { dsdt_line(" Method (_PPC, 0, NotSerialized)"); dsdt_line(" {"); - dsdt_line(" Return (^^CPU0._PPC)"); + dsdt_line(" Return (^^PR00._PPC)"); dsdt_line(" }"); dsdt_line(""); dsdt_line(" Method (_PCT, 0, NotSerialized)"); dsdt_line(" {"); - dsdt_line(" Return (^^CPU0._PCT)"); + dsdt_line(" Return (^^PR00._PCT)"); dsdt_line(" }"); dsdt_line(""); }