diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-18 10:18:44 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-18 10:18:44 -0500 |
| commit | df6606f4556a752d30a4eab26c626b6c34717ea8 (patch) | |
| tree | 095df894fd2f1e40f6a8a5a6393e10a953d8054d /hw/pci_bridge.c | |
| parent | 49023ff78cf1efeb861b475c40dd04262efe61d3 (diff) | |
| parent | 80aa796bf38b7ef21daa42673b4711510c450d8a (diff) | |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
* mst/tags/for_anthony:
pci_bridge_dev: fix error path in pci_bridge_dev_initfn()
qdev: release parent properties on dc->init failure
msi: Use msi/msix_present more consistently
msi: Invoke msi/msix_write_config from PCI core
msi: Guard msi/msix_write_config with msi_present
msi: Invoke msi/msix_reset from PCI core
msi: Guard msi_reset with msi_present
ahci: Clean up reset functions
intel-hda: Fix reset of MSI function
ahci: Fix reset of MSI function
rtl8139: honor RxOverflow flag in can_receive method
shpc: unparent device before free
Diffstat (limited to 'hw/pci_bridge.c')
| -rw-r--r-- | hw/pci_bridge.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c index 866f0b6c52..e0832b4a67 100644 --- a/hw/pci_bridge.c +++ b/hw/pci_bridge.c @@ -254,8 +254,9 @@ void pci_bridge_disable_base_limit(PCIDevice *dev) } /* reset bridge specific configuration registers */ -void pci_bridge_reset_reg(PCIDevice *dev) +void pci_bridge_reset(DeviceState *qdev) { + PCIDevice *dev = PCI_DEVICE(qdev); uint8_t *conf = dev->config; conf[PCI_PRIMARY_BUS] = 0; @@ -291,13 +292,6 @@ void pci_bridge_reset_reg(PCIDevice *dev) pci_set_word(conf + PCI_BRIDGE_CONTROL, 0); } -/* default reset function for PCI-to-PCI bridge */ -void pci_bridge_reset(DeviceState *qdev) -{ - PCIDevice *dev = PCI_DEVICE(qdev); - pci_bridge_reset_reg(dev); -} - /* default qdev initialization function for PCI-to-PCI bridge */ int pci_bridge_initfn(PCIDevice *dev) { |