Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

virt/kvm/assigned-dev.c

+4 −1
Original line number Diff line number Diff line
@@ -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 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, 
	mutex_unlock(&kvm->lock);

	return r;

out_list_del:

	pci_restore_state(dev);

	list_del(&match->list);

	pci_release_regions(dev);

out_disable: