summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Zhao <ethan.zhao@oracle.com>2014-09-09 10:21:26 +0800
committerBjorn Helgaas <bhelgaas@google.com>2014-09-16 16:18:40 -0600
commitad0d217ca645477ba30c2f3cf1a5bbb7ef18b1fd (patch)
treee7ae854942fa8df8538176afd6708963d3100d60
parentce0529843a505d09f5809a7db6288d2f038f64c4 (diff)
downloadblackbird-op-linux-ad0d217ca645477ba30c2f3cf1a5bbb7ef18b1fd.tar.gz
blackbird-op-linux-ad0d217ca645477ba30c2f3cf1a5bbb7ef18b1fd.zip
KVM: Use PCI device flag helper functions
Use PCI device flag helper functions when assigning or releasing device. No functional change. Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--virt/kvm/assigned-dev.c2
-rw-r--r--virt/kvm/iommu.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c
index 5819a2708d7e..e05000e200d2 100644
--- a/virt/kvm/assigned-dev.c
+++ b/virt/kvm/assigned-dev.c
@@ -302,7 +302,7 @@ static void kvm_free_assigned_device(struct kvm *kvm,
else
pci_restore_state(assigned_dev->dev);
- assigned_dev->dev->dev_flags &= ~PCI_DEV_FLAGS_ASSIGNED;
+ pci_clear_dev_assigned(assigned_dev->dev);
pci_release_regions(assigned_dev->dev);
pci_disable_device(assigned_dev->dev);
diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
index 714b94932312..e723bb91aa34 100644
--- a/virt/kvm/iommu.c
+++ b/virt/kvm/iommu.c
@@ -203,7 +203,7 @@ int kvm_assign_device(struct kvm *kvm,
goto out_unmap;
}
- pdev->dev_flags |= PCI_DEV_FLAGS_ASSIGNED;
+ pci_set_dev_assigned(pdev);
dev_info(&pdev->dev, "kvm assign device\n");
@@ -229,7 +229,7 @@ int kvm_deassign_device(struct kvm *kvm,
iommu_detach_device(domain, &pdev->dev);
- pdev->dev_flags &= ~PCI_DEV_FLAGS_ASSIGNED;
+ pci_clear_dev_assigned(pdev);
dev_info(&pdev->dev, "kvm deassign device\n");
OpenPOWER on IntegriCloud