[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] pc: replace i440fx_common_init() with i440fx_in
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 4/6] pc: replace i440fx_common_init() with i440fx_init() as it isn't used by anywhere else |
Date: |
Sun, 28 Jul 2013 09:29:11 +0200 |
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/pci-host/piix.c | 50 +++++++++++++-------------------------------------
1 file changed, 13 insertions(+), 37 deletions(-)
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index bf879e7..4624d04 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -239,19 +239,18 @@ static int i440fx_initfn(PCIDevice *dev)
return 0;
}
-static PCIBus *i440fx_common_init(const char *device_name,
- PCII440FXState **pi440fx_state,
- int *piix3_devfn,
- ISABus **isa_bus, qemu_irq *pic,
- MemoryRegion *address_space_mem,
- MemoryRegion *address_space_io,
- ram_addr_t ram_size,
- hwaddr pci_hole_start,
- hwaddr pci_hole_size,
- hwaddr pci_hole64_start,
- hwaddr pci_hole64_size,
- MemoryRegion *pci_address_space,
- MemoryRegion *ram_memory)
+PCIBus *i440fx_init(PCII440FXState **pi440fx_state,
+ int *piix3_devfn,
+ ISABus **isa_bus, qemu_irq *pic,
+ MemoryRegion *address_space_mem,
+ MemoryRegion *address_space_io,
+ ram_addr_t ram_size,
+ hwaddr pci_hole_start,
+ hwaddr pci_hole_size,
+ hwaddr pci_hole64_start,
+ hwaddr pci_hole64_size,
+ MemoryRegion *pci_address_space,
+ MemoryRegion *ram_memory)
{
DeviceState *dev;
PCIBus *b;
@@ -269,7 +268,7 @@ static PCIBus *i440fx_common_init(const char *device_name,
object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), NULL);
qdev_init_nofail(dev);
- d = pci_create_simple(b, 0, device_name);
+ d = pci_create_simple(b, 0, TYPE_I440FX_PCI_DEVICE);
*pi440fx_state = I440FX_PCI_DEVICE(d);
f = *pi440fx_state;
f->system_memory = address_space_mem;
@@ -330,29 +329,6 @@ static PCIBus *i440fx_common_init(const char *device_name,
return b;
}
-PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn,
- ISABus **isa_bus, qemu_irq *pic,
- MemoryRegion *address_space_mem,
- MemoryRegion *address_space_io,
- ram_addr_t ram_size,
- hwaddr pci_hole_start,
- hwaddr pci_hole_size,
- hwaddr pci_hole64_start,
- hwaddr pci_hole64_size,
- MemoryRegion *pci_memory, MemoryRegion *ram_memory)
-
-{
- PCIBus *b;
-
- b = i440fx_common_init(TYPE_I440FX_PCI_DEVICE, pi440fx_state,
- piix3_devfn, isa_bus, pic,
- address_space_mem, address_space_io, ram_size,
- pci_hole_start, pci_hole_size,
- pci_hole64_start, pci_hole64_size,
- pci_memory, ram_memory);
- return b;
-}
-
/* PIIX3 PCI to ISA bridge */
static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq)
{
--
1.8.3.1
- [Qemu-devel] [PATCH 2/6] pc: add I440FX QOM cast macro, (continued)
[Qemu-devel] [PATCH 1/6] pc: move IO_APIC_DEFAULT_ADDRESS to include/hw/i386/ioapic.h, Igor Mammedov, 2013/07/28
[Qemu-devel] [PATCH 3/6] utils: add range_size() wrapper, Igor Mammedov, 2013/07/28
[Qemu-devel] [PATCH 4/6] pc: replace i440fx_common_init() with i440fx_init() as it isn't used by anywhere else,
Igor Mammedov <=
[Qemu-devel] [PATCH 5/6] pc: add Q35 to QOM composition tree under /machine, Igor Mammedov, 2013/07/28
[Qemu-devel] [PATCH 6/6] pc: limit 64 bit hole to 2G by default, Igor Mammedov, 2013/07/28
- Re: [Qemu-devel] [PATCH 6/6] pc: limit 64 bit hole to 2G by default, Michael S. Tsirkin, 2013/07/28
- Re: [Qemu-devel] [PATCH 6/6] pc: limit 64 bit hole to 2G by default, Igor Mammedov, 2013/07/28
- Re: [Qemu-devel] [PATCH 6/6] pc: limit 64 bit hole to 2G by default, Michael S. Tsirkin, 2013/07/28
- Re: [Qemu-devel] [PATCH 6/6] pc: limit 64 bit hole to 2G by default, Andreas Färber, 2013/07/28
- Re: [Qemu-devel] [PATCH 6/6] pc: limit 64 bit hole to 2G by default, Igor Mammedov, 2013/07/28
- Re: [Qemu-devel] [PATCH 6/6] pc: limit 64 bit hole to 2G by default, Michael S. Tsirkin, 2013/07/28