diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2010-11-16 22:30:05 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-01-12 11:29:22 +0200 |
| commit | ed78661f2614d3c9f69c23e280db3bafdabdf5bb (patch) | |
| tree | 7344bdb2ae1ca07dcb2c4bf76e4618c1c65d47a9 /virt | |
| parent | 1e001d49f9f9a0e3eb72939ad49d9a2c7754e9c1 (diff) | |
| download | linux-3.10-ed78661f2614d3c9f69c23e280db3bafdabdf5bb.tar.gz linux-3.10-ed78661f2614d3c9f69c23e280db3bafdabdf5bb.tar.bz2 linux-3.10-ed78661f2614d3c9f69c23e280db3bafdabdf5bb.zip | |
KVM: Save/restore state of assigned PCI device
The guest may change states that pci_reset_function does not touch. So
we better save/restore the assigned device across guest usage.
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/assigned-dev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c index 7623408dbc8..d3892076f93 100644 --- a/virt/kvm/assigned-dev.c +++ b/virt/kvm/assigned-dev.c @@ -197,7 +197,8 @@ static void kvm_free_assigned_device(struct kvm *kvm, { kvm_free_assigned_irq(kvm, assigned_dev); - pci_reset_function(assigned_dev->dev); + __pci_reset_function(assigned_dev->dev); + pci_restore_state(assigned_dev->dev); pci_release_regions(assigned_dev->dev); pci_disable_device(assigned_dev->dev); @@ -514,6 +515,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, } pci_reset_function(dev); + pci_save_state(dev); match->assigned_dev_id = assigned_dev->assigned_dev_id; match->host_segnr = assigned_dev->segnr; @@ -544,6 +546,7 @@ out: mutex_unlock(&kvm->lock); return r; out_list_del: + pci_restore_state(dev); list_del(&match->list); pci_release_regions(dev); out_disable: |