diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-12-11 16:42:25 -0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-02-06 20:44:09 +0200 |
| commit | 7bc35e0f20a1e6f1b00edc85618437a495873bbd (patch) | |
| tree | 4782ddb1de8dec0c238e1856632d76791cce9bce /hw/i386 | |
| parent | 5934e2169a383cdb059f8ccd83f7e1c4d410c9b3 (diff) | |
| download | qemu-7bc35e0f20a1e6f1b00edc85618437a495873bbd.tar.gz | |
pc: Simplify xen_load_linux() signature
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>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc.c | 5 | ||||
| -rw-r--r-- | hw/i386/pc_piix.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index fbdad8813f..9745dcaec4 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1255,11 +1255,11 @@ void pc_acpi_init(const char *default_dsdt) } } -FWCfgState *xen_load_linux(PCMachineState *pcms, - PcGuestInfo *guest_info) +void xen_load_linux(PCMachineState *pcms) { int i; FWCfgState *fw_cfg; + PcGuestInfo *guest_info = &pcms->acpi_guest_info; 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); } guest_info->fw_cfg = fw_cfg; - return fw_cfg; } void pc_memory_init(PCMachineState *pcms, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ad51fd674b..4262c32575 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -165,7 +165,7 @@ static void pc_init1(MachineState *machine, rom_memory, &ram_memory); } else if (machine->kernel_filename != NULL) { /* 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)); |