UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jan Kiszka 2010-11-16 22:30:05 +01:00 committed by Avi Kivity
parent 1e001d49f9
commit ed78661f26
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virt/kvm/assigned-dev.c
View File

@ -197,7 +197,8 @@ static void kvm_free_assigned_device(struct kvm *kvm,
{ {
kvm_free_assigned_irq(kvm, assigned_dev); 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_release_regions(assigned_dev->dev);
pci_disable_device(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_reset_function(dev);
pci_save_state(dev);
match->assigned_dev_id = assigned_dev->assigned_dev_id; match->assigned_dev_id = assigned_dev->assigned_dev_id;
match->host_segnr = assigned_dev->segnr; match->host_segnr = assigned_dev->segnr;
@ -544,6 +546,7 @@ out:
mutex_unlock(&kvm->lock); mutex_unlock(&kvm->lock);
return r; return r;
out_list_del: out_list_del:
pci_restore_state(dev);
list_del(&match->list); list_del(&match->list);
pci_release_regions(dev); pci_release_regions(dev);
out_disable: out_disable: