Re: [Qemu-devel] [PATCH 3/3] hw/acpi: piix4_pm_init(): take fw_cfg object no more

[Laszlo Ersek]

On 04/29/15 15:20, Laszlo Ersek wrote:
> This PIIX4 init function has no more reason to receive a pointer to the
> FwCfg object. Remove the parameter from the prototype, and update callers.
> 
> As a result, the pc_init1() function no longer needs to save the return
> value of pc_memory_init() and xen_load_linux(), which makes it more
> similar to pc_memory_init().

Argh, mis-paste. Whoever picks this up (assuming the patches are good
enough), please replace the 2nd instance of pc_memory_init() with
pc_q35_init().

Thanks!
Laszlo

> The return type & value of pc_memory_init() and xen_load_linux() are not
> changed themselves; maybe we'll need their return values sometime later.
> 
> RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1204696
> Cc: Amit Shah <address@hidden>
> Cc: "Michael S. Tsirkin" <address@hidden>
> Cc: Paolo Bonzini <address@hidden>
> Cc: Richard Henderson <address@hidden>
> Cc: Eduardo Habkost <address@hidden>
> Cc: Aurelien Jarno <address@hidden>
> Cc: Leon Alrae <address@hidden>
> Signed-off-by: Laszlo Ersek <address@hidden>
> ---
>  include/hw/i386/pc.h |  3 +--
>  hw/acpi/piix4.c      |  3 +--
>  hw/i386/pc_piix.c    | 19 +++++++++----------
>  hw/mips/mips_malta.c |  2 +-
>  4 files changed, 12 insertions(+), 15 deletions(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 1b35168..3d966fa 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -219,8 +219,7 @@ void ioapic_init_gsi(GSIState *gsi_state, const char 
> *parent_name);
>  
>  I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
>                        qemu_irq sci_irq, qemu_irq smi_irq,
> -                      int kvm_enabled, FWCfgState *fw_cfg,
> -                      DeviceState **piix4_pm);
> +                      int kvm_enabled, DeviceState **piix4_pm);
>  void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);
>  
>  /* hpet.c */
> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
> index c53a31a..1e8e174 100644
> --- a/hw/acpi/piix4.c
> +++ b/hw/acpi/piix4.c
> @@ -492,8 +492,7 @@ Object *piix4_pm_find(void)
>  
>  I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
>                        qemu_irq sci_irq, qemu_irq smi_irq,
> -                      int kvm_enabled, FWCfgState *fw_cfg,
> -                      DeviceState **piix4_pm)
> +                      int kvm_enabled, DeviceState **piix4_pm)
>  {
>      DeviceState *dev;
>      PIIX4PMState *s;
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 1fe7bfb..0529434 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -99,7 +99,6 @@ static void pc_init1(MachineState *machine,
>      MemoryRegion *pci_memory;
>      MemoryRegion *rom_memory;
>      DeviceState *icc_bridge;
> -    FWCfgState *fw_cfg = NULL;
>      PcGuestInfo *guest_info;
>      ram_addr_t lowmem;
>  
> @@ -180,16 +179,16 @@ static void pc_init1(MachineState *machine,
>  
>      /* allocate ram and load rom/bios */
>      if (!xen_enabled()) {
> -        fw_cfg = pc_memory_init(machine, system_memory,
> -                                below_4g_mem_size, above_4g_mem_size,
> -                                rom_memory, &ram_memory, guest_info);
> +        pc_memory_init(machine, system_memory,
> +                       below_4g_mem_size, above_4g_mem_size,
> +                       rom_memory, &ram_memory, guest_info);
>      } else if (machine->kernel_filename != NULL) {
>          /* For xen HVM direct kernel boot, load linux here */
> -        fw_cfg = xen_load_linux(machine->kernel_filename,
> -                                machine->kernel_cmdline,
> -                                machine->initrd_filename,
> -                                below_4g_mem_size,
> -                                guest_info);
> +        xen_load_linux(machine->kernel_filename,
> +                       machine->kernel_cmdline,
> +                       machine->initrd_filename,
> +                       below_4g_mem_size,
> +                       guest_info);
>      }
>  
>      gsi_state = g_malloc0(sizeof(*gsi_state));
> @@ -288,7 +287,7 @@ static void pc_init1(MachineState *machine,
>          /* TODO: Populate SPD eeprom data.  */
>          smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
>                                gsi[9], *smi_irq,
> -                              kvm_enabled(), fw_cfg, &piix4_pm);
> +                              kvm_enabled(), &piix4_pm);
>          smbus_eeprom_init(smbus, 8, NULL, 0);
>  
>          object_property_add_link(OBJECT(machine), 
> PC_MACHINE_ACPI_DEVICE_PROP,
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index b0fa71a..79ab678 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -1160,7 +1160,7 @@ void mips_malta_init(MachineState *machine)
>      pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1);
>      pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci");
>      smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100,
> -                          isa_get_irq(NULL, 9), NULL, 0, NULL, NULL);
> +                          isa_get_irq(NULL, 9), NULL, 0, NULL);
>      smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
>      g_free(smbus_eeprom_buf);
>      pit = pit_init(isa_bus, 0x40, 0, NULL);
>