From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpdmf-00008B-H4 for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zpdme-0005Ud-Q6 for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpdme-0005UC-Li for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:32 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 2D14191759 for ; Fri, 23 Oct 2015 14:57:32 +0000 (UTC) From: Igor Mammedov Date: Fri, 23 Oct 2015 16:57:10 +0200 Message-Id: <1445612242-79172-8-git-send-email-imammedo@redhat.com> In-Reply-To: <1445612242-79172-1-git-send-email-imammedo@redhat.com> References: <1445612242-79172-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 07/19] pc: acpi: memhp: move MHPD._STA method into MHPT table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mst@redhat.com Signed-off-by: Igor Mammedov --- hw/acpi/memory_hotplug_acpi_table.c | 3 +++ hw/i386/acpi-dsdt-mem-hotplug.dsl | 8 -------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c index 28da13c..c99a5c3 100644 --- a/hw/acpi/memory_hotplug_acpi_table.c +++ b/hw/acpi/memory_hotplug_acpi_table.c @@ -73,6 +73,9 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem, aml_append(field, /* _OST status code, write only */ aml_named_field(stringify(MEMORY_SLOT_OST_STATUS), 32)); aml_append(ctrl_dev, field); + + /* present, functioning, decoding, not shown in UI */ + aml_append(ctrl_dev, aml_name_decl("_STA", aml_int(0xB))); } aml_append(table, ctrl_dev); diff --git a/hw/i386/acpi-dsdt-mem-hotplug.dsl b/hw/i386/acpi-dsdt-mem-hotplug.dsl index c2bb6a1..b4eacc9 100644 --- a/hw/i386/acpi-dsdt-mem-hotplug.dsl +++ b/hw/i386/acpi-dsdt-mem-hotplug.dsl @@ -35,14 +35,6 @@ External(MEMORY_SLOT_OST_EVENT, FieldUnitObj) // _OST event code, write only External(MEMORY_SLOT_OST_STATUS, FieldUnitObj) // _OST status code, write only - Method(_STA, 0) { - If (LEqual(MEMORY_SLOTS_NUMBER, Zero)) { - Return(0x0) - } - /* present, functioning, decoding, not shown in UI */ - Return(0xB) - } - Mutex (MEMORY_SLOT_LOCK, 0) Method(MEMORY_SLOT_SCAN_METHOD, 0) { -- 1.8.3.1