Il 27/11/2013 16:53, Igor Mammedov ha scritto:
Patch looks good, Please add patch to update hw/i386/ssdt-proc.hex.generated for hosts without iasl for completness
Also please rename PXM to CPXM or CPPX for consistency.
Paolo
hw/i386/acpi-build.c | 5 +++++ hw/i386/ssdt-proc.dsl | 5 +++++ 2 files changed, 10 insertions(+)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d089e1e..3c11ddc 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -603,6 +603,7 @@ static inline char acpi_get_hex(uint32_t val) #define ACPI_PROC_OFFSET_CPUHEX (*ssdt_proc_name - *ssdt_proc_start + 2) #define ACPI_PROC_OFFSET_CPUID1 (*ssdt_proc_name - *ssdt_proc_start + 4) #define ACPI_PROC_OFFSET_CPUID2 (*ssdt_proc_id - *ssdt_proc_start) +#define ACPI_PROC_OFFSET_CPUPXM (*ssdt_proc_pxm - *ssdt_proc_start) #define ACPI_PROC_SIZEOF (*ssdt_proc_end - *ssdt_proc_start) #define ACPI_PROC_AML (ssdp_proc_aml + *ssdt_proc_start)
@@ -724,6 +725,10 @@ build_ssdt(GArray *table_data, GArray *linker, proc[ACPI_PROC_OFFSET_CPUHEX+1] = acpi_get_hex(i); proc[ACPI_PROC_OFFSET_CPUID1] = i; proc[ACPI_PROC_OFFSET_CPUID2] = i;
proc[ACPI_PROC_OFFSET_CPUPXM] = guest_info->node_cpu[i];proc[ACPI_PROC_OFFSET_CPUPXM + 1] = 0;proc[ACPI_PROC_OFFSET_CPUPXM + 2] = 0;proc[ACPI_PROC_OFFSET_CPUPXM + 3] = 0; } /* build this code:diff --git a/hw/i386/ssdt-proc.dsl b/hw/i386/ssdt-proc.dsl index 8229bfd..8d4c5bf 100644 --- a/hw/i386/ssdt-proc.dsl +++ b/hw/i386/ssdt-proc.dsl @@ -47,6 +47,8 @@ DefinitionBlock ("ssdt-proc.aml", "SSDT", 0x01, "BXPC", "BXSSDT", 0x1)
- also updating the C code.
*/ Name(_HID, "ACPI0007")
ACPI_EXTRACT_NAME_DWORD_CONST ssdt_proc_pxmName(PXM, 0xAAAAAAAA) External(CPMA, MethodObj) External(CPST, MethodObj) External(CPEJ, MethodObj)@@ -59,5 +61,8 @@ DefinitionBlock ("ssdt-proc.aml", "SSDT", 0x01, "BXPC", "BXSSDT", 0x1) Method(_EJ0, 1, NotSerialized) { CPEJ(ID, Arg0) }
Method(_PXM, 0) {Return (PXM)}