From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpdmr-0000T5-Uc for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zpdmr-0005a0-10 for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpdmq-0005Zs-S4 for qemu-devel@nongnu.org; Fri, 23 Oct 2015 10:57:44 -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 81D3E341AC4 for ; Fri, 23 Oct 2015 14:57:44 +0000 (UTC) From: Igor Mammedov Date: Fri, 23 Oct 2015 16:57:22 +0200 Message-Id: <1445612242-79172-20-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 19/19] pc: acpi: memhp: cleanup MEMORY_HOTPLUG_IO_REGION usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mst@redhat.com MEMORY_HOTPLUG_IO_REGION isn't used anywhere else except of memory_hotplug_acpi_table.c, so move it there and cleanup stringify() ugliness Signed-off-by: Igor Mammedov --- hw/acpi/memory_hotplug_acpi_table.c | 10 +++++----- include/hw/acpi/pc-hotplug.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/acpi/memory_hotplug_acpi_table.c b/hw/acpi/memory_hotplug_acpi_table.c index e370233..14df930 100644 --- a/hw/acpi/memory_hotplug_acpi_table.c +++ b/hw/acpi/memory_hotplug_acpi_table.c @@ -21,6 +21,7 @@ #define MEMORY_SLOT_SIZE "MRL" #define MEMORY_SLOT_LOCK "MLCK" #define MEMORY_SLOT_SLECTOR "MSEL" +#define MEMORY_HOTPLUG_IO_REGION "HPMR" #define BASEPATH "\\_SB.PCI0." MEMORY_HOTPLUG_DEVICE "." @@ -53,11 +54,10 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem, aml_append(ctrl_dev, aml_name_decl("_CRS", crs)); aml_append(ctrl_dev, aml_operation_region( - stringify(MEMORY_HOTPLUG_IO_REGION), AML_SYSTEM_IO, - io_base, io_len) + MEMORY_HOTPLUG_IO_REGION, AML_SYSTEM_IO, io_base, io_len) ); - field = aml_field(stringify(MEMORY_HOTPLUG_IO_REGION), AML_DWORD_ACC, + field = aml_field(MEMORY_HOTPLUG_IO_REGION, AML_DWORD_ACC, AML_PRESERVE); aml_append(field, /* read only */ aml_named_field(MEMORY_SLOT_ADDR, 64)); @@ -67,7 +67,7 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem, aml_named_field(MEMORY_SLOT_PROXIMITY, 32)); aml_append(ctrl_dev, field); - field = aml_field(stringify(MEMORY_HOTPLUG_IO_REGION), AML_BYTE_ACC, + field = aml_field(MEMORY_HOTPLUG_IO_REGION, AML_BYTE_ACC, AML_WRITE_AS_ZEROS); aml_append(field, aml_reserved_field(160 /* bits, Offset(20) */)); aml_append(field, /* 1 if enabled, read only */ @@ -83,7 +83,7 @@ void build_mhpt(GArray *table_data, GArray *linker, uint32_t nr_mem, aml_named_field(MEMORY_SLOT_EJECT, 1)); aml_append(ctrl_dev, field); - field = aml_field(stringify(MEMORY_HOTPLUG_IO_REGION), AML_DWORD_ACC, + field = aml_field(MEMORY_HOTPLUG_IO_REGION, AML_DWORD_ACC, AML_PRESERVE); aml_append(field, /* DIMM selector, write only */ aml_named_field(MEMORY_SLOT_SLECTOR, 32)); diff --git a/include/hw/acpi/pc-hotplug.h b/include/hw/acpi/pc-hotplug.h index 65e7d3b..a4f513d 100644 --- a/include/hw/acpi/pc-hotplug.h +++ b/include/hw/acpi/pc-hotplug.h @@ -32,6 +32,4 @@ #define ACPI_MEMORY_HOTPLUG_IO_LEN 24 #define ACPI_MEMORY_HOTPLUG_BASE 0x0a00 -#define MEMORY_HOTPLUG_IO_REGION HPMR - #endif -- 1.8.3.1