[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/14] pc: Simplify xen_load_linux() signature
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v2 06/14] pc: Simplify xen_load_linux() signature |
Date: |
Fri, 11 Dec 2015 16:42:25 -0200 |
We can get the PcGuestInfo struct directly from PCMachineState,
and the return value is not needed at all.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/i386/pc.c | 5 ++---
hw/i386/pc_piix.c | 2 +-
include/hw/i386/pc.h | 3 +--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b4c638d..aa12814 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 f7bc1c0..f39c086 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -164,7 +164,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));
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 3943507..24362ef 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -230,8 +230,7 @@ PcGuestInfo *pc_guest_info_init(PCMachineState *pcms);
void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory,
MemoryRegion *pci_address_space);
-FWCfgState *xen_load_linux(PCMachineState *pcms,
- PcGuestInfo *guest_info);
+void xen_load_linux(PCMachineState *pcms);
void pc_memory_init(PCMachineState *pcms,
MemoryRegion *system_memory,
MemoryRegion *rom_memory,
--
2.1.0
- [Qemu-devel] [PATCH v2 01/14] q35: Remove MCHPCIState.guest_info field, (continued)
- [Qemu-devel] [PATCH v2 01/14] q35: Remove MCHPCIState.guest_info field, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 02/14] pc: Group and document related PCMachineState/PCMachineclass fields, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 03/14] pc: Move PcGuestInfo declaration to top of file, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 04/14] pc: Eliminate struct PcGuestInfoState, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 05/14] pc: Simplify pc_memory_init() signature, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 06/14] pc: Simplify xen_load_linux() signature,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v2 07/14] acpi: Remove guest_info parameters from functions, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 08/14] acpi: Don't save PcGuestInfo on AcpiBuildState, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 09/14] pc: Remove compat fields from PcGuestInfo, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 10/14] pc: Remove RAM size fields from PcGuestInfo, Eduardo Habkost, 2015/12/11