Commit ed78661f authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity

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: default avatarAlex Williamson <alex.williamson@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 1e001d49
...@@ -197,7 +197,8 @@ static void kvm_free_assigned_device(struct kvm *kvm, ...@@ -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, ...@@ -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 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, ...@@ -544,6 +546,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment