[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/11] hw/pci-host/i440fx: Remove unused parameter from i440fx_ini
From: |
Laurent Vivier |
Subject: |
[PULL 07/11] hw/pci-host/i440fx: Remove unused parameter from i440fx_init() |
Date: |
Wed, 29 Jun 2022 11:08:45 +0200 |
From: 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>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20220612192800.40813-1-shentey@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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 0fc2361ffeda..a234989ac363 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 e08716142b6e..1c5ad5f918a2 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 f068aaba8fda..52518dbf08e6 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
- [PULL 00/11] Trivial branch for 7.1 patches, Laurent Vivier, 2022/06/29
- [PULL 07/11] hw/pci-host/i440fx: Remove unused parameter from i440fx_init(),
Laurent Vivier <=
- [PULL 06/11] MAINTAINERS: Add softmmu/runstate.c to "Main loop", Laurent Vivier, 2022/06/29
- [PULL 03/11] util: Return void on iova_tree_remove, Laurent Vivier, 2022/06/29
- [PULL 01/11] vga: avoid crash if no default vga card, Laurent Vivier, 2022/06/29
- [PULL 11/11] hw/i386/xen/xen-hvm: Inline xen_piix_pci_write_config_client() and remove it, Laurent Vivier, 2022/06/29
- [PULL 04/11] Trivial: 3 char repeat typos, Laurent Vivier, 2022/06/29
- [PULL 09/11] hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM), Laurent Vivier, 2022/06/29
- [PULL 02/11] qom/object: Remove circular include dependency, Laurent Vivier, 2022/06/29
- [PULL 05/11] trivial typos: namesapce, Laurent Vivier, 2022/06/29
- [PULL 10/11] hw/i386/xen/xen-hvm: Allow for stubbing xen_set_pci_link_route(), Laurent Vivier, 2022/06/29
- [PULL 08/11] common-user: Only compile the common user code if have_user is set, Laurent Vivier, 2022/06/29