OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc: Simplify xen_load_linux() signature

Browse Source 
We can get the PcGuestInfo struct directly from PCMachineState,
and the return value is not needed at all.

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>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
This commit is contained in:
Eduardo Habkost 2015-12-11 16:42:25 -02:00 committed by Michael S. Tsirkin
parent 5934e2169a
commit 7bc35e0f20
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/i386/pc.c
View File

@ -1255,11 +1255,11 @@ void pc_acpi_init(const char *default_dsdt)
} }
} }
FWCfgState *xen_load_linux(PCMachineState *pcms, void xen_load_linux(PCMachineState *pcms)
PcGuestInfo *guest_info)
{ {
int i; int i;
FWCfgState *fw_cfg; FWCfgState *fw_cfg;
PcGuestInfo *guest_info = &pcms->acpi_guest_info;
assert(MACHINE(pcms)->kernel_filename != NULL); assert(MACHINE(pcms)->kernel_filename != NULL);
@ -1273,7 +1273,6 @@ FWCfgState *xen_load_linux(PCMachineState *pcms,
rom_add_option(option_rom[i].name, option_rom[i].bootindex); rom_add_option(option_rom[i].name, option_rom[i].bootindex);
} }
guest_info->fw_cfg = fw_cfg; guest_info->fw_cfg = fw_cfg;
return fw_cfg;
} }
void pc_memory_init(PCMachineState *pcms, void pc_memory_init(PCMachineState *pcms,

2
hw/i386/pc_piix.c
View File

@ -165,7 +165,7 @@ static void pc_init1(MachineState *machine,
rom_memory, &ram_memory); rom_memory, &ram_memory);
} 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(pcms, guest_info); xen_load_linux(pcms);
} }
gsi_state = g_malloc0(sizeof(*gsi_state)); gsi_state = g_malloc0(sizeof(*gsi_state));

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

@ -248,8 +248,7 @@ PcGuestInfo *pc_guest_info_init(PCMachineState *pcms);
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(PCMachineState *pcms, void xen_load_linux(PCMachineState *pcms);
PcGuestInfo *guest_info);
void pc_memory_init(PCMachineState *pcms, void pc_memory_init(PCMachineState *pcms,
MemoryRegion *system_memory, MemoryRegion *system_memory,
MemoryRegion *rom_memory, MemoryRegion *rom_memory,