From b734fde5d6286730ccb603099b79e8211d174317 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 3 Jun 2011 08:51:05 +0200 Subject: [PATCH] --- yaml --- r: 258033 b: refs/heads/master c: 91e3d71db29d9b3b67b64e2a08e724a7ff538b4c h: refs/heads/master i: 258031: f692a3cdebc217c3d2c38faada9444dcf0416731 v: v3 --- [refs] | 2 +- trunk/Documentation/virtual/kvm/api.txt | 7 +------ trunk/include/linux/kvm.h | 8 +------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index c80ad137dd82..e49b775aa180 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e57d4a356ad3ac46881399c424cc6cf6dd16359d +refs/heads/master: 91e3d71db29d9b3b67b64e2a08e724a7ff538b4c diff --git a/trunk/Documentation/virtual/kvm/api.txt b/trunk/Documentation/virtual/kvm/api.txt index 2bd06b018b32..0ebe9225b171 100644 --- a/trunk/Documentation/virtual/kvm/api.txt +++ b/trunk/Documentation/virtual/kvm/api.txt @@ -1143,15 +1143,10 @@ Assigns an IRQ to a passed-through device. struct kvm_assigned_irq { __u32 assigned_dev_id; - __u32 host_irq; + __u32 host_irq; /* ignored (legacy field) */ __u32 guest_irq; __u32 flags; union { - struct { - __u32 addr_lo; - __u32 addr_hi; - __u32 data; - } guest_msi; __u32 reserved[12]; }; }; diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h index 55ef181521ff..9c9ca7c7b491 100644 --- a/trunk/include/linux/kvm.h +++ b/trunk/include/linux/kvm.h @@ -773,20 +773,14 @@ struct kvm_assigned_pci_dev { struct kvm_assigned_irq { __u32 assigned_dev_id; - __u32 host_irq; + __u32 host_irq; /* ignored (legacy field) */ __u32 guest_irq; __u32 flags; union { - struct { - __u32 addr_lo; - __u32 addr_hi; - __u32 data; - } guest_msi; __u32 reserved[12]; }; }; - struct kvm_assigned_msix_nr { __u32 assigned_dev_id; __u16 entry_nr;