[Qemu-devel] [PATCH 19/19] pc: acpi: memhp: cleanup MEMORY_HOTPLUG_IO_REGION usage

[Igor Mammedov]

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 <address@hidden>
---
 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