diff options
| author | Don Koch <dkoch@verizon.com> | 2013-07-09 11:40:02 -0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-07-10 12:49:26 +0300 |
| commit | e78e9ae4a933504d383703870d491615b0261801 (patch) | |
| tree | bc73e61c3d4c8bb506328a25128dd0d36ad159ee | |
| parent | 7588e2b0559ae72d3c2952c7807fc05c03099970 (diff) | |
| download | focaccia-qemu-e78e9ae4a933504d383703870d491615b0261801.tar.gz focaccia-qemu-e78e9ae4a933504d383703870d491615b0261801.zip | |
pci-bridge: update mappings for migration/restore
Fix for LP#1187529: Devices on PCI bridge stop working when live-migrated. Update bridge mappings for all PCI bridge devices in get_pci_config_device(). Signed-off-by: Don Koch <dkoch@verizon.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/pci/pci.c | 5 | ||||
| -rw-r--r-- | hw/pci/pci_bridge.c | 2 | ||||
| -rw-r--r-- | include/hw/pci/pci_bridge.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 868006338b..8087c18996 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -378,6 +378,7 @@ int pci_bus_num(PCIBus *s) static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) { PCIDevice *s = container_of(pv, PCIDevice, config); + PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(s); uint8_t *config; int i; @@ -395,6 +396,10 @@ static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) memcpy(s->config, config, size); pci_update_mappings(s); + if (pc->is_bridge) { + PCIBridge *b = container_of(s, PCIBridge, dev); + pci_bridge_update_mappings(b); + } memory_region_set_enabled(&s->bus_master_enable_region, pci_get_word(s->config + PCI_COMMAND) diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 24be6c5067..3897bd8fac 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -224,7 +224,7 @@ static void pci_bridge_region_cleanup(PCIBridge *br, PCIBridgeWindows *w) g_free(w); } -static void pci_bridge_update_mappings(PCIBridge *br) +void pci_bridge_update_mappings(PCIBridge *br) { PCIBridgeWindows *w = br->windows; diff --git a/include/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h index 1868f7aea8..1d8f9973c7 100644 --- a/include/hw/pci/pci_bridge.h +++ b/include/hw/pci/pci_bridge.h @@ -37,6 +37,7 @@ PCIBus *pci_bridge_get_sec_bus(PCIBridge *br); pcibus_t pci_bridge_get_base(const PCIDevice *bridge, uint8_t type); pcibus_t pci_bridge_get_limit(const PCIDevice *bridge, uint8_t type); +void pci_bridge_update_mappings(PCIBridge *br); void pci_bridge_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len); void pci_bridge_disable_base_limit(PCIDevice *dev); |