SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pc: Remove redundant arguments from *load_linux()

Browse Source 
Remove arguments that can be found in PCMachineState.

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>
This commit is contained in:
Eduardo Habkost 2015-08-07 16:55:53 -03:00 committed by Michael S. Tsirkin
parent b9cfc918dd
commit df1f79fdbb
3 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/i386/pc.c
View File

@ -809,11 +809,8 @@ static long get_file_size(FILE *f)
return size; return size;
} }
static void load_linux(FWCfgState *fw_cfg, static void load_linux(PCMachineState *pcms,
const char *kernel_filename, FWCfgState *fw_cfg)
const char *initrd_filename,
const char *kernel_cmdline,
hwaddr max_ram_size)
{ {
uint16_t protocol; uint16_t protocol;
int setup_size, kernel_size, initrd_size = 0, cmdline_size; 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; hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr = 0;
FILE *f; FILE *f;
char *vmode; 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 */ /* Align to 16 bytes as a paranoia measure */
cmdline_size = (strlen(kernel_cmdline)+16) & ~15; cmdline_size = (strlen(kernel_cmdline)+16) & ~15;
@ -886,8 +887,8 @@ static void load_linux(FWCfgState *fw_cfg,
initrd_max = 0x37ffffff; initrd_max = 0x37ffffff;
} }
if (initrd_max >= max_ram_size - acpi_data_size) { if (initrd_max >= pcms->below_4g_mem_size - acpi_data_size) {
initrd_max = max_ram_size - acpi_data_size - 1; initrd_max = pcms->below_4g_mem_size - acpi_data_size - 1;
} }
fw_cfg_add_i32(fw_cfg, FW_CFG_CMDLINE_ADDR, cmdline_addr); 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, FWCfgState *xen_load_linux(PCMachineState *pcms,
const char *kernel_cmdline,
const char *initrd_filename,
ram_addr_t below_4g_mem_size,
PcGuestInfo *guest_info) PcGuestInfo *guest_info)
{ {
int i; int i;
FWCfgState *fw_cfg; FWCfgState *fw_cfg;
assert(kernel_filename != NULL); assert(MACHINE(pcms)->kernel_filename != NULL);
fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT); fw_cfg = fw_cfg_init_io(BIOS_CFG_IOPORT);
rom_set_fw(fw_cfg); rom_set_fw(fw_cfg);
load_linux(fw_cfg, kernel_filename, initrd_filename, load_linux(pcms, fw_cfg);
kernel_cmdline, below_4g_mem_size);
for (i = 0; i < nb_option_roms; i++) { for (i = 0; i < nb_option_roms; i++) {
assert(!strcmp(option_rom[i].name, "linuxboot.bin") || assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||
!strcmp(option_rom[i].name, "multiboot.bin")); !strcmp(option_rom[i].name, "multiboot.bin"));
@ -1400,8 +1397,7 @@ FWCfgState *pc_memory_init(PCMachineState *pcms,
} }
if (linux_boot) { if (linux_boot) {
load_linux(fw_cfg, machine->kernel_filename, machine->initrd_filename, load_linux(pcms, fw_cfg);
machine->kernel_cmdline, below_4g_mem_size);
} }
for (i = 0; i < nb_option_roms; i++) { for (i = 0; i < nb_option_roms; i++) {

6
hw/i386/pc_piix.c
View File

@ -183,11 +183,7 @@ static void pc_init1(MachineState *machine)
rom_memory, &ram_memory, guest_info); rom_memory, &ram_memory, guest_info);
} else if (machine->kernel_filename != NULL) { } else if (machine->kernel_filename != NULL) {
/* For xen HVM direct kernel boot, load linux here */ /* For xen HVM direct kernel boot, load linux here */
xen_load_linux(machine->kernel_filename, xen_load_linux(pcms, guest_info);
machine->kernel_cmdline,
machine->initrd_filename,
pcms->below_4g_mem_size,
guest_info);
} }
gsi_state = g_malloc0(sizeof(*gsi_state)); gsi_state = g_malloc0(sizeof(*gsi_state));

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

@ -180,10 +180,7 @@ void pc_set_legacy_acpi_data_size(void);
void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory,
MemoryRegion *pci_address_space); MemoryRegion *pci_address_space);
FWCfgState *xen_load_linux(const char *kernel_filename, FWCfgState *xen_load_linux(PCMachineState *pcms,
const char *kernel_cmdline,
const char *initrd_filename,
ram_addr_t below_4g_mem_size,
PcGuestInfo *guest_info); PcGuestInfo *guest_info);
FWCfgState *pc_memory_init(PCMachineState *pcms, FWCfgState *pc_memory_init(PCMachineState *pcms,
MemoryRegion *system_memory, MemoryRegion *system_memory,