Re: [PATCH] hw/pci-host/i440fx: Remove unused parameter from i440fx_init()

[Laurent Vivier]

Le 12/06/2022 à 21:28, Bernhard Beschow a écrit :
> pi440fx_state is an out-parameter which is never read by the caller.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/i386/pc_piix.c            | 3 ---
>   hw/pci-host/i440fx.c         | 4 +---
>   include/hw/pci-host/i440fx.h | 1 -
>   3 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 0fc2361ffe..a234989ac3 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -82,7 +82,6 @@ static void pc_init1(MachineState *machine,
>       MemoryRegion *system_io = get_system_io();
>       PCIBus *pci_bus;
>       ISABus *isa_bus;
> -    PCII440FXState *i440fx_state;
>       int piix3_devfn = -1;
>       qemu_irq smi_irq;
>       GSIState *gsi_state;
> @@ -203,7 +202,6 @@ static void pc_init1(MachineState *machine,
>   
>           pci_bus = i440fx_init(host_type,
>                                 pci_type,
> -                              &i440fx_state,
>                                 system_memory, system_io, machine->ram_size,
>                                 x86ms->below_4g_mem_size,
>                                 x86ms->above_4g_mem_size,
> @@ -217,7 +215,6 @@ static void pc_init1(MachineState *machine,
>           isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
>       } else {
>           pci_bus = NULL;
> -        i440fx_state = NULL;
>           isa_bus = isa_bus_new(NULL, get_system_memory(), system_io,
>                                 &error_abort);
>           pcms->hpet_enabled = false;
> diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
> index e08716142b..1c5ad5f918 100644
> --- a/hw/pci-host/i440fx.c
> +++ b/hw/pci-host/i440fx.c
> @@ -238,7 +238,6 @@ static void i440fx_realize(PCIDevice *dev, Error **errp)
>   }
>   
>   PCIBus *i440fx_init(const char *host_type, const char *pci_type,
> -                    PCII440FXState **pi440fx_state,
>                       MemoryRegion *address_space_mem,
>                       MemoryRegion *address_space_io,
>                       ram_addr_t ram_size,
> @@ -264,8 +263,7 @@ PCIBus *i440fx_init(const char *host_type, const char 
> *pci_type,
>       sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
>   
>       d = pci_create_simple(b, 0, pci_type);
> -    *pi440fx_state = I440FX_PCI_DEVICE(d);
> -    f = *pi440fx_state;
> +    f = I440FX_PCI_DEVICE(d);
>       f->system_memory = address_space_mem;
>       f->pci_address_space = pci_address_space;
>       f->ram_memory = ram_memory;
> diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h
> index f068aaba8f..52518dbf08 100644
> --- a/include/hw/pci-host/i440fx.h
> +++ b/include/hw/pci-host/i440fx.h
> @@ -36,7 +36,6 @@ struct PCII440FXState {
>   #define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX"
>   
>   PCIBus *i440fx_init(const char *host_type, const char *pci_type,
> -                    PCII440FXState **pi440fx_state,
>                       MemoryRegion *address_space_mem,
>                       MemoryRegion *address_space_io,
>                       ram_addr_t ram_size,

Applied to my trivial-patches branch.

Thanks,
Laurent