* [PATCH] hw/pci-host/i440fx: Remove unused parameter from i440fx_init()
@ 2022-06-12 19:28 Bernhard Beschow
2022-06-19 21:44 ` B
2022-06-28 9:11 ` Laurent Vivier
0 siblings, 2 replies; 4+ messages in thread
From: Bernhard Beschow @ 2022-06-12 19:28 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Marcel Apfelbaum, Michael S. Tsirkin,
Richard Henderson, Eduardo Habkost, qemu-trivial,
Bernhard Beschow
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,
--
2.36.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] hw/pci-host/i440fx: Remove unused parameter from i440fx_init()
2022-06-12 19:28 [PATCH] hw/pci-host/i440fx: Remove unused parameter from i440fx_init() Bernhard Beschow
@ 2022-06-19 21:44 ` B
2022-06-20 7:10 ` Mark Cave-Ayland
2022-06-28 9:11 ` Laurent Vivier
1 sibling, 1 reply; 4+ messages in thread
From: B @ 2022-06-19 21:44 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Marcel Apfelbaum, Michael S. Tsirkin,
Richard Henderson, Eduardo Habkost, qemu-trivial
Am 12. Juni 2022 19:28:00 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>pi440fx_state is an out-parameter which is never read by the caller.
>
>Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Ping
>---
> 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,
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] hw/pci-host/i440fx: Remove unused parameter from i440fx_init()
2022-06-19 21:44 ` B
@ 2022-06-20 7:10 ` Mark Cave-Ayland
0 siblings, 0 replies; 4+ messages in thread
From: Mark Cave-Ayland @ 2022-06-20 7:10 UTC (permalink / raw)
To: B, qemu-devel
Cc: Paolo Bonzini, Marcel Apfelbaum, Michael S. Tsirkin,
Richard Henderson, Eduardo Habkost, qemu-trivial
On 19/06/2022 22:44, B wrote:
> Am 12. Juni 2022 19:28:00 UTC schrieb Bernhard Beschow <shentey@gmail.com>:
>> pi440fx_state is an out-parameter which is never read by the caller.
>>
>> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
>
> Ping
>
>> ---
>> 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,
Looks good to me, so:
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
In fact that whole i440fx_init() function looks like it's another candidate for
QOM-ification...
ATB,
Mark.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] hw/pci-host/i440fx: Remove unused parameter from i440fx_init()
2022-06-12 19:28 [PATCH] hw/pci-host/i440fx: Remove unused parameter from i440fx_init() Bernhard Beschow
2022-06-19 21:44 ` B
@ 2022-06-28 9:11 ` Laurent Vivier
1 sibling, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2022-06-28 9:11 UTC (permalink / raw)
To: Bernhard Beschow, qemu-devel
Cc: Paolo Bonzini, Marcel Apfelbaum, Michael S. Tsirkin,
Richard Henderson, Eduardo Habkost, qemu-trivial
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-28 9:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-12 19:28 [PATCH] hw/pci-host/i440fx: Remove unused parameter from i440fx_init() Bernhard Beschow
2022-06-19 21:44 ` B
2022-06-20 7:10 ` Mark Cave-Ayland
2022-06-28 9:11 ` Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).