Commit 44fc8c5e authored by Igor Mammedov's avatar Igor Mammedov Committed by Anthony Liguori
Browse files

pc: replace i440fx_common_init() with i440fx_init() 



It isn't used anywhere else.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Message-id: 1375109277-25561-4-git-send-email-imammedo@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1d0d4aa4

hw/pci-host/piix.c

+13 −37
Original line number Diff line number Diff line
@@ -239,8 +239,7 @@ static int i440fx_initfn(PCIDevice *dev) 
    return 0;

}



static PCIBus *i440fx_common_init(const char *device_name,

                                  PCII440FXState **pi440fx_state,

PCIBus *i440fx_init(PCII440FXState **pi440fx_state,

                    int *piix3_devfn,

                    ISABus **isa_bus, qemu_irq *pic,

                    MemoryRegion *address_space_mem,
@@ -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)

{