[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 11/16] pc: Simplify signature of xen_load_linux(
From: |
Stefano Stabellini |
Subject: |
Re: [Qemu-devel] [PATCH 11/16] pc: Simplify signature of xen_load_linux() |
Date: |
Fri, 11 Dec 2015 11:40:14 +0000 |
User-agent: |
Alpine 2.02 (DEB 1266 2009-07-14) |
On Tue, 1 Dec 2015, Eduardo Habkost wrote:
> We don't need the FWCfgState return value and the PcGuestInfo
> parameter.
>
> Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
> hw/i386/pc.c | 5 +----
> hw/i386/pc_piix.c | 2 +-
> include/hw/i386/pc.h | 3 +--
> 3 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index a219187..a9ec402 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1253,8 +1253,7 @@ 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;
> @@ -1271,7 +1270,6 @@ FWCfgState *xen_load_linux(PCMachineState *pcms,
> rom_add_option(option_rom[i].name, option_rom[i].bootindex);
> }
> pcms->fw_cfg = fw_cfg;
> - return fw_cfg;
> }
>
> FWCfgState *pc_memory_init(PCMachineState *pcms,
> @@ -1401,7 +1399,6 @@ FWCfgState *pc_memory_init(PCMachineState *pcms,
> rom_add_option(option_rom[i].name, option_rom[i].bootindex);
> }
> pcms->fw_cfg = fw_cfg;
> - return fw_cfg;
> }
>
> qemu_irq pc_allocate_cpu_irq(void)
> 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 03750bc..2732a72 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -205,8 +205,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);
> FWCfgState *pc_memory_init(PCMachineState *pcms,
> MemoryRegion *system_memory,
> MemoryRegion *rom_memory,
> --
> 2.1.0
>
>
- [Qemu-devel] [PATCH 06/16] acpi: Save PCMachineState on AcpiBuildState, (continued)
[Qemu-devel] [PATCH 07/16] acpi: Make acpi_build() get PCMachineState as argument, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 09/16] acpi: Remove ram size fields fron PcGuestInfo, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 08/16] acpi: Make build_srat() get PCMachineState as argument, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 10/16] pc: Move PcGuestInfo.fw_cfg field to PCMachineState, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 11/16] pc: Simplify signature of xen_load_linux(), Eduardo Habkost, 2015/12/01
- Re: [Qemu-devel] [PATCH 11/16] pc: Simplify signature of xen_load_linux(),
Stefano Stabellini <=
[Qemu-devel] [PATCH 12/16] pc: Remove PcGuestInfo.isapc_ram_fw field, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 13/16] q35: Remove MCHPCIState.guest_info field, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 14/16] acpi: Use PCMachineClass fields directly, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 15/16] pc: Move PcGuestInfo.apic_xrupt_override field to PCMachineState, Eduardo Habkost, 2015/12/01
[Qemu-devel] [PATCH 16/16] pc: Move APIC and NUMA data from PcGuestInfo to PCMachineState, Eduardo Habkost, 2015/12/01
Re: [Qemu-devel] [PATCH 00/16] pc: Eliminate struct PcGuestInfo, Marcel Apfelbaum, 2015/12/07