[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/16] acpi: Remove ram size fields fron PcGuestInfo
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 09/16] acpi: Remove ram size fields fron PcGuestInfo |
Date: |
Tue, 1 Dec 2015 23:47:04 -0200 |
The ACPI code can use the PCMachineState fields directly.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/acpi-build.c | 10 +++++-----
hw/i386/pc.c | 2 --
include/hw/i386/pc.h | 1 -
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 8841798..9f2129d 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1505,17 +1505,17 @@ build_srat(GArray *table_data, GArray *linker,
PCMachineState *pcms)
next_base = mem_base + mem_len;
/* Cut out the ACPI_PCI hole */
- if (mem_base <= guest_info->ram_size_below_4g &&
- next_base > guest_info->ram_size_below_4g) {
- mem_len -= next_base - guest_info->ram_size_below_4g;
+ if (mem_base <= pcms->below_4g_mem_size &&
+ next_base > pcms->below_4g_mem_size) {
+ mem_len -= next_base - pcms->below_4g_mem_size;
if (mem_len > 0) {
numamem = acpi_data_push(table_data, sizeof *numamem);
acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1,
MEM_AFFINITY_ENABLED);
}
mem_base = 1ULL << 32;
- mem_len = next_base - guest_info->ram_size_below_4g;
- next_base += (1ULL << 32) - guest_info->ram_size_below_4g;
+ mem_len = next_base - pcms->below_4g_mem_size;
+ next_base += (1ULL << 32) - pcms->below_4g_mem_size;
}
numamem = acpi_data_push(table_data, sizeof *numamem);
acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1,
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index fc98a20..8687adb 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1187,8 +1187,6 @@ PcGuestInfo *pc_guest_info_init(PCMachineState *pcms)
PcGuestInfo *guest_info = &pcms->acpi_guest_info;
int i, j;
- guest_info->ram_size_below_4g = pcms->below_4g_mem_size;
- guest_info->ram_size = pcms->below_4g_mem_size + pcms->above_4g_mem_size;
guest_info->apic_id_limit = pc_apic_id_limit(max_cpus);
guest_info->apic_xrupt_override = kvm_allows_irq0_override();
guest_info->numa_nodes = nb_numa_nodes;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 1be2641..6cb9ca8 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -23,7 +23,6 @@
/* Machine info for ACPI build: */
struct PcGuestInfo {
bool isapc_ram_fw;
- hwaddr ram_size, ram_size_below_4g;
unsigned apic_id_limit;
bool apic_xrupt_override;
uint64_t numa_nodes;
--
2.1.0
- [Qemu-devel] [PATCH 04/16] acpi: Make acpi_setup() get PCMachineState as argument, (continued)
[Qemu-devel] [PATCH 07/16] acpi: Make acpi_build() get PCMachineState as argument, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 09/16] acpi: Remove ram size fields fron PcGuestInfo,
Eduardo Habkost <=
[Qemu-devel] [PATCH 08/16] acpi: Make build_srat() get PCMachineState as argument, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 10/16] pc: Move PcGuestInfo.fw_cfg field to PCMachineState, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 11/16] pc: Simplify signature of xen_load_linux(), Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 12/16] pc: Remove PcGuestInfo.isapc_ram_fw field, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 13/16] q35: Remove MCHPCIState.guest_info field, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 14/16] acpi: Use PCMachineClass fields directly, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 15/16] pc: Move PcGuestInfo.apic_xrupt_override field to PCMachineState, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 16/16] pc: Move APIC and NUMA data from PcGuestInfo to PCMachineState, Eduardo Habkost, 2015/12/01
Re: [Qemu-devel] [PATCH 00/16] pc: Eliminate struct PcGuestInfo, Marcel Apfelbaum, 2015/12/07