aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-06-03 02:51:05 -0400
committerAvi Kivity <avi@redhat.com>2011-07-12 06:16:16 -0400
commit91e3d71db29d9b3b67b64e2a08e724a7ff538b4c (patch)
tree5bdaf33de54e039faa8892ab4291e6089de03675
parente57d4a356ad3ac46881399c424cc6cf6dd16359d (diff)
KVM: Clarify KVM_ASSIGN_PCI_DEVICE documentation
Neither host_irq nor the guest_msi struct are used anymore today. Tag the former, drop the latter to avoid confusion. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--Documentation/virtual/kvm/api.txt7
-rw-r--r--include/linux/kvm.h8
2 files changed, 2 insertions, 13 deletions
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index 2bd06b018b32..0ebe9225b171 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -1143,15 +1143,10 @@ Assigns an IRQ to a passed-through device.
1143 1143
1144struct kvm_assigned_irq { 1144struct kvm_assigned_irq {
1145 __u32 assigned_dev_id; 1145 __u32 assigned_dev_id;
1146 __u32 host_irq; 1146 __u32 host_irq; /* ignored (legacy field) */
1147 __u32 guest_irq; 1147 __u32 guest_irq;
1148 __u32 flags; 1148 __u32 flags;
1149 union { 1149 union {
1150 struct {
1151 __u32 addr_lo;
1152 __u32 addr_hi;
1153 __u32 data;
1154 } guest_msi;
1155 __u32 reserved[12]; 1150 __u32 reserved[12];
1156 }; 1151 };
1157}; 1152};
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 55ef181521ff..9c9ca7c7b491 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -773,20 +773,14 @@ struct kvm_assigned_pci_dev {
773 773
774struct kvm_assigned_irq { 774struct kvm_assigned_irq {
775 __u32 assigned_dev_id; 775 __u32 assigned_dev_id;
776 __u32 host_irq; 776 __u32 host_irq; /* ignored (legacy field) */
777 __u32 guest_irq; 777 __u32 guest_irq;
778 __u32 flags; 778 __u32 flags;
779 union { 779 union {
780 struct {
781 __u32 addr_lo;
782 __u32 addr_hi;
783 __u32 data;
784 } guest_msi;
785 __u32 reserved[12]; 780 __u32 reserved[12];
786 }; 781 };
787}; 782};
788 783
789
790struct kvm_assigned_msix_nr { 784struct kvm_assigned_msix_nr {
791 __u32 assigned_dev_id; 785 __u32 assigned_dev_id;
792 __u16 entry_nr; 786 __u16 entry_nr;