From b4b10d2d22b4e2d63aa649773c6ae52fcc35a126 Mon Sep 17 00:00:00 2001
From: Weidong Han <weidong.han@intel.com>
Date: Fri, 13 Feb 2009 10:50:56 +0800
Subject: [PATCH] --- yaml --- r: 133751 b: refs/heads/master c:
 2df8a40bccf5999261d0d3a82eac5a77678e61bd h: refs/heads/master i:   133749:
 83212259ef898f3a9edabf176731772f7dd167a1   133747:
 2f015cdbedef88a65b2d1c7b7082677efdecc286   133743:
 dd774271a72846f81021d3cb401f29ab4076dc00 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/kvm.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 028cba38c99d..29e2d99b5407 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0a1835d53c57bc38b36867c04436b60454cb610
+refs/heads/master: 2df8a40bccf5999261d0d3a82eac5a77678e61bd
diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
index dd48225d1824..0d94b274c3ae 100644
--- a/trunk/include/linux/kvm.h
+++ b/trunk/include/linux/kvm.h
@@ -406,6 +406,9 @@ struct kvm_trace_rec {
 #define KVM_CAP_IRQ_ROUTING 25
 #endif
 #define KVM_CAP_IRQ_INJECT_STATUS 26
+#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
+#define KVM_CAP_DEVICE_DEASSIGNMENT 27
+#endif
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
@@ -480,6 +483,8 @@ struct kvm_irq_routing {
 #define KVM_ASSIGN_IRQ _IOR(KVMIO, 0x70, \
 			    struct kvm_assigned_irq)
 #define KVM_REINJECT_CONTROL      _IO(KVMIO, 0x71)
+#define KVM_DEASSIGN_PCI_DEVICE _IOR(KVMIO, 0x72, \
+				     struct kvm_assigned_pci_dev)
 
 /*
  * ioctls for vcpu fds