[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 09/42] pc: acpi: simplify build_legacy_cpu_hotplug_aml
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [RFC 09/42] pc: acpi: simplify build_legacy_cpu_hotplug_aml() signature |
Date: |
Mon, 2 May 2016 14:33:18 +0200 |
since IO block used by CPU hotplug is fixed size and
initialized it the same file as build_legacy_cpu_hotplug_aml()
just use ACPI_GPE_PROC_LEN directly instead of passing
it around in several files.
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/acpi/cpu_hotplug.c | 6 +++---
hw/i386/acpi-build.c | 5 +----
include/hw/acpi/cpu_hotplug.h | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 2d4e034..36ea6c2 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -87,7 +87,7 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent,
Object *owner,
}
void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
- uint16_t io_base, uint16_t io_len)
+ uint16_t io_base)
{
Aml *dev;
Aml *crs;
@@ -226,13 +226,13 @@ void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState
*machine,
aml_append(dev, aml_name_decl("_STA", aml_int(0xB)));
crs = aml_resource_template();
aml_append(crs,
- aml_io(AML_DECODE16, io_base, io_base, 1, io_len)
+ aml_io(AML_DECODE16, io_base, io_base, 1, ACPI_GPE_PROC_LEN)
);
aml_append(dev, aml_name_decl("_CRS", crs));
aml_append(sb_scope, dev);
/* declare CPU hotplug MMIO region and PRS field to access it */
aml_append(sb_scope, aml_operation_region(
- "PRST", AML_SYSTEM_IO, aml_int(io_base), io_len));
+ "PRST", AML_SYSTEM_IO, aml_int(io_base), ACPI_GPE_PROC_LEN));
field = aml_field("PRST", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
aml_append(field, aml_named_field("PRS", 256));
aml_append(sb_scope, field);
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 30ee1b1..4a7eab3 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -94,7 +94,6 @@ typedef struct AcpiPmInfo {
uint32_t gpe0_blk_len;
uint32_t io_base;
uint16_t cpu_hp_io_base;
- uint16_t cpu_hp_io_len;
uint16_t mem_hp_io_base;
uint16_t mem_hp_io_len;
uint16_t pcihp_io_base;
@@ -142,7 +141,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
}
assert(obj);
- pm->cpu_hp_io_len = ACPI_GPE_PROC_LEN;
pm->mem_hp_io_base = ACPI_MEMORY_HOTPLUG_BASE;
pm->mem_hp_io_len = ACPI_MEMORY_HOTPLUG_IO_LEN;
@@ -1935,8 +1933,7 @@ build_dsdt(GArray *table_data, GArray *linker,
build_q35_pci0_int(dsdt);
}
- build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base,
- pm->cpu_hp_io_len);
+ build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base);
build_memory_hotplug_aml(dsdt, nr_mem, pm->mem_hp_io_base,
pm->mem_hp_io_len);
diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
index 241b50f..6d729d8 100644
--- a/include/hw/acpi/cpu_hotplug.h
+++ b/include/hw/acpi/cpu_hotplug.h
@@ -28,5 +28,5 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent,
Object *owner,
AcpiCpuHotplug *gpe_cpu, uint16_t base);
void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine,
- uint16_t io_base, uint16_t io_len);
+ uint16_t io_base);
#endif
--
1.8.3.1
- [Qemu-devel] [RFC 00/42] ACPI CPU hotplug refactoring to support more than 255 CPUs and PXM/OST methods, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 02/42] acpi: add aml_refof(), Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 05/42] pc: acpi: consolidate \GPE._E02 with the rest of CPU hotplug AML, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 04/42] pc: acpi: consolidate CPU hotplug AML, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 01/42] acpi: add aml_debug(), Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 06/42] pc: acpi: cpu-hotplug: make AML CPU_foo defines local to cpu_hotplug_acpi_table.c, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 07/42] pc: acpi: mark current CPU hotplug functions as legacy, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 09/42] pc: acpi: simplify build_legacy_cpu_hotplug_aml() signature,
Igor Mammedov <=
- [Qemu-devel] [RFC 11/42] pc: add 2.7 machine, Igor Mammedov, 2016/05/02
- [Qemu-devel] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types, Igor Mammedov, 2016/05/02
- Re: [Qemu-devel] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types, Eduardo Habkost, 2016/05/10
- Re: [Qemu-devel] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types, Igor Mammedov, 2016/05/11
- Re: [Qemu-devel] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types, Michael S. Tsirkin, 2016/05/11
- Re: [Qemu-devel] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types, Eduardo Habkost, 2016/05/11
- Re: [Qemu-devel] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types, Michael S. Tsirkin, 2016/05/12
- Re: [Qemu-devel] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types, Igor Mammedov, 2016/05/12
- Re: [Qemu-devel] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types, Eduardo Habkost, 2016/05/12