[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/15] i440fx: eliminate i440fx_common_init
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 07/15] i440fx: eliminate i440fx_common_init |
Date: |
Thu, 26 Jan 2012 13:00:52 -0600 |
---
hw/piix_pci.c | 48 ++++++++++++------------------------------------
1 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index 4735d9c..589708e 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -263,19 +263,17 @@ 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,
- target_phys_addr_t pci_hole_start,
- target_phys_addr_t pci_hole_size,
- target_phys_addr_t pci_hole64_start,
- target_phys_addr_t 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,
+ target_phys_addr_t pci_hole_start,
+ target_phys_addr_t pci_hole_size,
+ target_phys_addr_t pci_hole64_start,
+ target_phys_addr_t pci_hole64_size,
+ MemoryRegion *pci_address_space, MemoryRegion *ram_memory)
+
{
DeviceState *dev;
PCIBus *b;
@@ -293,7 +291,7 @@ static PCIBus *i440fx_common_init(const char *device_name,
qdev_init_nofail(dev);
object_property_add_child(object_get_root(), "i440fx", OBJECT(dev), NULL);
- d = pci_create_simple(b, 0, device_name);
+ d = pci_create_simple(b, 0, "i440FX");
*pi440fx_state = DO_UPCAST(PCII440FXState, dev, d);
f = *pi440fx_state;
f->system_memory = address_space_mem;
@@ -355,28 +353,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,
- target_phys_addr_t pci_hole_start,
- target_phys_addr_t pci_hole_size,
- target_phys_addr_t pci_hole64_start,
- target_phys_addr_t pci_hole64_size,
- MemoryRegion *pci_memory, MemoryRegion *ram_memory)
-
-{
- PCIBus *b;
-
- b = i440fx_common_init("i440FX", pi440fx_state, piix3_devfn, isa_bus, pic,
- address_space_mem, address_space_io, ram_size,
- pci_hole_start, pci_hole_size,
- pci_hole64_size, 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.7.4.1
- [Qemu-devel] [PATCH 13/15] i440fx: allocate MemoryRegion for pci memory space, (continued)
- [Qemu-devel] [PATCH 13/15] i440fx: allocate MemoryRegion for pci memory space, Anthony Liguori, 2012/01/26
- [Qemu-devel] [PATCH 12/15] i440fx-pmc: calculate PCI memory hole directly, Anthony Liguori, 2012/01/26
- [Qemu-devel] [PATCH 14/15] i440fx: move bios loading to i440fx, Anthony Liguori, 2012/01/26
- [Qemu-devel] [PATCH 15/15] i440fx: move ram initialization into i440fx-pmc, Anthony Liguori, 2012/01/26
- Re: [Qemu-devel] [RFC 00/15] Refactor PC machine to take advantage of QOM, Peter Maydell, 2012/01/26
- [Qemu-devel] [PATCH 10/15] i440fx: move some logic to realize and make inheritance from PCIHost explicit, Anthony Liguori, 2012/01/26
- [Qemu-devel] [PATCH 09/15] i440fx: create the PMC through composition, Anthony Liguori, 2012/01/26
- [Qemu-devel] [PATCH 07/15] i440fx: eliminate i440fx_common_init,
Anthony Liguori <=