mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc: Remove RAM size fields from PcGuestInfo

Browse Source 
The ACPI code can use the PCMachineState fields directly.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
This commit is contained in:
Eduardo Habkost 2015-12-11 16:42:29 -02:00 committed by Michael S. Tsirkin
parent bb292f5a9b
commit 5299f1c70a
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/i386/acpi-build.c
View File

@ -2421,17 +2421,17 @@ build_srat(GArray *table_data, GArray *linker)
next_base = mem_base + mem_len; next_base = mem_base + mem_len;
/* Cut out the ACPI_PCI hole */ /* Cut out the ACPI_PCI hole */
if (mem_base <= guest_info->ram_size_below_4g && if (mem_base <= pcms->below_4g_mem_size &&
next_base > guest_info->ram_size_below_4g) { next_base > pcms->below_4g_mem_size) {
mem_len -= next_base - guest_info->ram_size_below_4g; mem_len -= next_base - pcms->below_4g_mem_size;
if (mem_len > 0) { if (mem_len > 0) {
numamem = acpi_data_push(table_data, sizeof *numamem); numamem = acpi_data_push(table_data, sizeof *numamem);
acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1, acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1,
MEM_AFFINITY_ENABLED); MEM_AFFINITY_ENABLED);
} }
mem_base = 1ULL << 32; mem_base = 1ULL << 32;
mem_len = next_base - guest_info->ram_size_below_4g; mem_len = next_base - pcms->below_4g_mem_size;
next_base += (1ULL << 32) - guest_info->ram_size_below_4g; next_base += (1ULL << 32) - pcms->below_4g_mem_size;
} }
numamem = acpi_data_push(table_data, sizeof *numamem); numamem = acpi_data_push(table_data, sizeof *numamem);
acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1, acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1,

2
hw/i386/pc.c
View File

@ -1188,8 +1188,6 @@ PcGuestInfo *pc_guest_info_init(PCMachineState *pcms)
PcGuestInfo *guest_info = &pcms->acpi_guest_info; PcGuestInfo *guest_info = &pcms->acpi_guest_info;
int i, j; 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_id_limit = pc_apic_id_limit(max_cpus);
guest_info->apic_xrupt_override = kvm_allows_irq0_override(); guest_info->apic_xrupt_override = kvm_allows_irq0_override();
guest_info->numa_nodes = nb_numa_nodes; guest_info->numa_nodes = nb_numa_nodes;

1
include/hw/i386/pc.h
View File

@ -36,7 +36,6 @@
/* Machine info for ACPI build: */ /* Machine info for ACPI build: */
struct PcGuestInfo { struct PcGuestInfo {
bool isapc_ram_fw; bool isapc_ram_fw;
hwaddr ram_size, ram_size_below_4g;
unsigned apic_id_limit; unsigned apic_id_limit;
bool apic_xrupt_override; bool apic_xrupt_override;
uint64_t numa_nodes; uint64_t numa_nodes;