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

pc: Move acpi_data_size global to PCMachineClass 



This way we don't need code in pc_compat_*() functions to set the legacy
acpi_data_size value.

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 2b0ddf66

hw/i386/pc.c

+6 −11
Original line number Diff line number Diff line
@@ -77,15 +77,6 @@ 
#define DPRINTF(fmt, ...)

#endif



/* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables

 * (128K) and other BIOS datastructures (less than 4K reported to be used at

 * the moment, 32K should be enough for a while).  */

static unsigned acpi_data_size = 0x20000 + 0x8000;

void pc_set_legacy_acpi_data_size(void)

{

    acpi_data_size = 0x10000;

}



#define BIOS_CFG_IOPORT 0x510

#define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0)

#define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1)
@@ -841,6 +832,7 @@ static void load_linux(PCMachineState *pcms, 
    FILE *f;

    char *vmode;

    MachineState *machine = MACHINE(pcms);

    PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);

    const char *kernel_filename = machine->kernel_filename;

    const char *initrd_filename = machine->initrd_filename;

    const char *kernel_cmdline = machine->kernel_cmdline;
@@ -908,8 +900,8 @@ static void load_linux(PCMachineState *pcms, 
        initrd_max = 0x37ffffff;

    }



    if (initrd_max >= pcms->below_4g_mem_size - acpi_data_size) {

        initrd_max = pcms->below_4g_mem_size - acpi_data_size - 1;

    if (initrd_max >= pcms->below_4g_mem_size - pcmc->acpi_data_size) {

        initrd_max = pcms->below_4g_mem_size - pcmc->acpi_data_size - 1;

    }



    fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_ADDR, cmdline_addr);
@@ -1961,6 +1953,9 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
    pcmc->gigabyte_align = true;

    pcmc->has_reserved_memory = true;

    pcmc->kvmclock_enabled = true;

    /* BIOS ACPI tables: 128K. Other BIOS datastructures: less than 4K reported

     * to be used at the moment, 32K should be enough for a while.  */

    pcmc->acpi_data_size = 0x20000 + 0x8000;

    mc->get_hotplug_handler = pc_get_hotpug_handler;

    mc->cpu_index_to_socket_id = pc_cpu_index_to_socket_id;

    mc->default_boot_order = "cad";

hw/i386/pc_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ static void pc_compat_2_1(MachineState *machine) 
static void pc_compat_2_0(MachineState *machine)

{

    pc_compat_2_1(machine);

    pc_set_legacy_acpi_data_size();

}



static void pc_compat_1_7(MachineState *machine)
@@ -517,6 +516,7 @@ static void pc_i440fx_2_0_machine_options(MachineClass *m) 
     * QEMU 1.7 it is 6414.  For RHEL/CentOS 7.0 it is 6418.

     */

    pcmc->legacy_acpi_table_size = 6652;

    pcmc->acpi_data_size = 0x10000;

}



DEFINE_I440FX_MACHINE(v2_0, "pc-i440fx-2.0", pc_compat_2_0,

hw/i386/pc_q35.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ static void pc_compat_2_1(MachineState *machine) 
static void pc_compat_2_0(MachineState *machine)

{

    pc_compat_2_1(machine);

    pc_set_legacy_acpi_data_size();

}



static void pc_compat_1_7(MachineState *machine)
@@ -424,6 +423,7 @@ static void pc_q35_2_0_machine_options(MachineClass *m) 
    SET_MACHINE_COMPAT(m, PC_COMPAT_2_0);

    pcmc->has_reserved_memory = false;

    pcmc->smbios_legacy_mode = true;

    pcmc->acpi_data_size = 0x10000;

}



DEFINE_Q35_MACHINE(v2_0, "pc-q35-2.0", pc_compat_2_0,

include/hw/i386/pc.h

+4 −2
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ struct PCMachineClass { 
    bool has_reserved_memory;

    bool kvmclock_enabled;

    int legacy_acpi_table_size;

    /* Leave a chunk of memory at the top of RAM for the BIOS ACPI tables

     * and other BIOS datastructures.

     */

    unsigned acpi_data_size;

};



#define TYPE_PC_MACHINE "generic-pc-machine"
@@ -201,8 +205,6 @@ void pc_acpi_init(const char *default_dsdt); 


PcGuestInfo *pc_guest_info_init(PCMachineState *pcms);



void pc_set_legacy_acpi_data_size(void);



#define PCI_HOST_PROP_PCI_HOLE_START   "pci-hole-start"

#define PCI_HOST_PROP_PCI_HOLE_END     "pci-hole-end"

#define PCI_HOST_PROP_PCI_HOLE64_START "pci-hole64-start"