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

pc: Remove redundant arguments from *load_linux() 



Remove arguments that can be found in PCMachineState.

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 b9cfc918

hw/i386/pc.c

+12 −16
Original line number Diff line number Diff line
@@ -809,11 +809,8 @@ static long get_file_size(FILE *f) 
    return size;

}



static void load_linux(FWCfgState *fw_cfg,

                       const char *kernel_filename,

                       const char *initrd_filename,

                       const char *kernel_cmdline,

                       hwaddr max_ram_size)

static void load_linux(PCMachineState *pcms,

                       FWCfgState *fw_cfg)

{

    uint16_t protocol;

    int setup_size, kernel_size, initrd_size = 0, cmdline_size;
@@ -822,6 +819,10 @@ static void load_linux(FWCfgState *fw_cfg, 
    hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr = 0;

    FILE *f;

    char *vmode;

    MachineState *machine = MACHINE(pcms);

    const char *kernel_filename = machine->kernel_filename;

    const char *initrd_filename = machine->initrd_filename;

    const char *kernel_cmdline = machine->kernel_cmdline;



    /* Align to 16 bytes as a paranoia measure */

    cmdline_size = (strlen(kernel_cmdline)+16) & ~15;
@@ -886,8 +887,8 @@ static void load_linux(FWCfgState *fw_cfg, 
        initrd_max = 0x37ffffff;

    }



    if (initrd_max >= max_ram_size - acpi_data_size) {

        initrd_max = max_ram_size - acpi_data_size - 1;

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

        initrd_max = pcms->below_4g_mem_size - acpi_data_size - 1;

    }



    fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_ADDR, cmdline_addr);
@@ -1263,22 +1264,18 @@ void pc_acpi_init(const char *default_dsdt) 
    }

}



FWCfgState *xen_load_linux(const char *kernel_filename,

                           const char *kernel_cmdline,

                           const char *initrd_filename,

                           ram_addr_t below_4g_mem_size,

FWCfgState *xen_load_linux(PCMachineState *pcms,

                           PcGuestInfo *guest_info)

{

    int i;

    FWCfgState *fw_cfg;



    assert(kernel_filename != NULL);

    assert(MACHINE(pcms)->kernel_filename != NULL);



    fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT);

    rom_set_fw(fw_cfg);



    load_linux(fw_cfg, kernel_filename, initrd_filename,

               kernel_cmdline, below_4g_mem_size);

    load_linux(pcms, fw_cfg);

    for (i = 0; i < nb_option_roms; i++) {

        assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||

               !strcmp(option_rom[i].name, "multiboot.bin"));
@@ -1400,8 +1397,7 @@ FWCfgState *pc_memory_init(PCMachineState *pcms, 
    }



    if (linux_boot) {

        load_linux(fw_cfg, machine->kernel_filename, machine->initrd_filename,

                   machine->kernel_cmdline, below_4g_mem_size);

        load_linux(pcms, fw_cfg);

    }



    for (i = 0; i < nb_option_roms; i++) {

hw/i386/pc_piix.c

+1 −5
Original line number Diff line number Diff line
@@ -183,11 +183,7 @@ static void pc_init1(MachineState *machine) 
                       rom_memory, &ram_memory, guest_info);

    } else if (machine->kernel_filename != NULL) {

        /* For xen HVM direct kernel boot, load linux here */

        xen_load_linux(machine->kernel_filename,

                       machine->kernel_cmdline,

                       machine->initrd_filename,

                       pcms->below_4g_mem_size,

                       guest_info);

        xen_load_linux(pcms, guest_info);

    }



    gsi_state = g_malloc0(sizeof(*gsi_state));

include/hw/i386/pc.h

+1 −4
Original line number Diff line number Diff line
@@ -180,10 +180,7 @@ void pc_set_legacy_acpi_data_size(void); 
void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory,

                            MemoryRegion *pci_address_space);



FWCfgState *xen_load_linux(const char *kernel_filename,

                           const char *kernel_cmdline,

                           const char *initrd_filename,

                           ram_addr_t below_4g_mem_size,

FWCfgState *xen_load_linux(PCMachineState *pcms,

                           PcGuestInfo *guest_info);

FWCfgState *pc_memory_init(PCMachineState *pcms,

                           MemoryRegion *system_memory,