falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcie_host: Turn pcie_host_init() into an instance_init 

This assures the trivial field initialization is applied for any derived
type - currently only Q35PCIHost.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Andreas Färber 2014-04-24 17:26:51 +02:00 committed by Michael S. Tsirkin
parent 0d73394ad9
commit 7c8b724826
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/pci-host/q35.c
View File

@ -47,10 +47,6 @@ static void q35_host_realize(DeviceState *dev, Error **errp)
sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, &pci->data_mem); sysbus_add_io(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, &pci->data_mem);
sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, 4); sysbus_init_ioports(sbd, MCH_HOST_BRIDGE_CONFIG_DATA, 4);
if (pcie_host_init(PCIE_HOST_BRIDGE(s)) < 0) {
error_setg(errp, "failed to initialize pcie host");
return;
}
pci->bus = pci_bus_new(DEVICE(s), "pcie.0", pci->bus = pci_bus_new(DEVICE(s), "pcie.0",
s->mch.pci_address_space, s->mch.address_space_io, s->mch.pci_address_space, s->mch.address_space_io,
0, TYPE_PCIE_BUS); 0, TYPE_PCIE_BUS);

7
hw/pci/pcie_host.c
View File

@ -83,11 +83,11 @@ static const MemoryRegionOps pcie_mmcfg_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
int pcie_host_init(PCIExpressHost *e) static void pcie_host_init(Object *obj)
{ {
e->base_addr = PCIE_BASE_ADDR_UNMAPPED; PCIExpressHost *e = PCIE_HOST_BRIDGE(obj);
return 0; e->base_addr = PCIE_BASE_ADDR_UNMAPPED;
} }
void pcie_host_mmcfg_unmap(PCIExpressHost *e) void pcie_host_mmcfg_unmap(PCIExpressHost *e)
@ -128,6 +128,7 @@ static const TypeInfo pcie_host_type_info = {
.parent = TYPE_PCI_HOST_BRIDGE, .parent = TYPE_PCI_HOST_BRIDGE,
.abstract = true, .abstract = true,
.instance_size = sizeof(PCIExpressHost), .instance_size = sizeof(PCIExpressHost),
.instance_init = pcie_host_init,
}; };
static void pcie_host_register_types(void) static void pcie_host_register_types(void)

1
include/hw/pci/pcie_host.h
View File

@ -49,7 +49,6 @@ struct PCIExpressHost {
MemoryRegion mmio; MemoryRegion mmio;
}; };
int pcie_host_init(PCIExpressHost *e);
void pcie_host_mmcfg_unmap(PCIExpressHost *e); void pcie_host_mmcfg_unmap(PCIExpressHost *e);
void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr, uint32_t size); void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr, uint32_t size);
void pcie_host_mmcfg_update(PCIExpressHost *e, void pcie_host_mmcfg_update(PCIExpressHost *e,