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

pc: Use PCMachineState as pc_guest_info_init() argument 



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>
parent c0aa4e1e

hw/i386/pc.c

+3 −4
Original line number Diff line number Diff line
@@ -1189,15 +1189,14 @@ void pc_guest_info_machine_done(Notifier *notifier, void *data) 
    acpi_setup(&guest_info_state->info);

}



PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,

                                ram_addr_t above_4g_mem_size)

PcGuestInfo *pc_guest_info_init(PCMachineState *pcms)

{

    PcGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state);

    PcGuestInfo *guest_info = &guest_info_state->info;

    int i, j;



    guest_info->ram_size_below_4g = below_4g_mem_size;

    guest_info->ram_size = below_4g_mem_size + above_4g_mem_size;

    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;

hw/i386/pc_piix.c

+1 −2
Original line number Diff line number Diff line
@@ -160,8 +160,7 @@ static void pc_init1(MachineState *machine) 
        rom_memory = system_memory;

    }



    guest_info = pc_guest_info_init(pcms->below_4g_mem_size,

                                    pcms->above_4g_mem_size);

    guest_info = pc_guest_info_init(pcms);



    guest_info->has_acpi_build = has_acpi_build;

    guest_info->legacy_acpi_table_size = legacy_acpi_table_size;

hw/i386/pc_q35.c

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ static void pc_q35_init(MachineState *machine) 
        rom_memory = get_system_memory();

    }



    guest_info = pc_guest_info_init(pcms->below_4g_mem_size,

                                    pcms->above_4g_mem_size);

    guest_info = pc_guest_info_init(pcms);

    guest_info->isapc_ram_fw = false;

    guest_info->has_acpi_build = has_acpi_build;

    guest_info->has_reserved_memory = has_reserved_memory;

include/hw/i386/pc.h

+1 −2
Original line number Diff line number Diff line
@@ -165,8 +165,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge); 
void pc_hot_add_cpu(const int64_t id, Error **errp);

void pc_acpi_init(const char *default_dsdt);



PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,

                                ram_addr_t above_4g_mem_size);

PcGuestInfo *pc_guest_info_init(PCMachineState *pcms);



void pc_set_legacy_acpi_data_size(void);