Commit 5299f1c7 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

pc: Remove RAM size fields from PcGuestInfo 



The ACPI code can use the PCMachineState fields directly.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
parent bb292f5a

hw/i386/acpi-build.c

+5 −5
Original line number Diff line number Diff line
@@ -2421,17 +2421,17 @@ build_srat(GArray *table_data, GArray *linker) 
        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,

hw/i386/pc.c

+0 −2
Original line number Diff line number Diff line
@@ -1188,8 +1188,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;

include/hw/i386/pc.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,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;