diff mbox

[v2] KVM: Clarify KVM_ASSIGN_PCI_DEVICE documentation

Message ID 4DE88459.3010205@web.de (mailing list archive)
State New, archived
Headers show

Commit Message

Jan Kiszka June 3, 2011, 6:51 a.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

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>
---
 Documentation/virtual/kvm/api.txt |    7 +------
 include/linux/kvm.h               |    8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

Comments

Avi Kivity June 6, 2011, 8:42 a.m. UTC | #1
On 06/03/2011 09:51 AM, Jan Kiszka wrote:
> From: Jan Kiszka<jan.kiszka@siemens.com>
>
> Neither host_irq nor the guest_msi struct are used anymore today.
> Tag the former, drop the latter to avoid confusion.
>

> diff --git a/include/linux/kvm.h b/include/linux/kvm.h
> index 55ef181..9c9ca7c 100644
> --- a/include/linux/kvm.h
> +++ b/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;

Can we just drop a definition like this?  When did we last use this?

(in fact I can't find when we *ever* used this)
Jan Kiszka June 6, 2011, 7:57 p.m. UTC | #2
On 2011-06-06 10:42, Avi Kivity wrote:
> On 06/03/2011 09:51 AM, Jan Kiszka wrote:
>> From: Jan Kiszka<jan.kiszka@siemens.com>
>>
>> Neither host_irq nor the guest_msi struct are used anymore today.
>> Tag the former, drop the latter to avoid confusion.
>>
> 
>> diff --git a/include/linux/kvm.h b/include/linux/kvm.h
>> index 55ef181..9c9ca7c 100644
>> --- a/include/linux/kvm.h
>> +++ b/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;
> 
> Can we just drop a definition like this?  When did we last use this?
> 
> (in fact I can't find when we *ever* used this)
> 

The kernel interface was present between in 2.6.29 only. The fact that
we simply dropped that API (replacing it with the current one) indicates
that no one was expecting this to be actually used.

I also do not find any traces of the old way of assigning MSIs in qemu-kvm.

Jan
Avi Kivity June 9, 2011, 8:13 a.m. UTC | #3
On 06/06/2011 10:57 PM, Jan Kiszka wrote:
> >
> >  Can we just drop a definition like this?  When did we last use this?
> >
> >  (in fact I can't find when we *ever* used this)
> >
>
> The kernel interface was present between in 2.6.29 only. The fact that
> we simply dropped that API (replacing it with the current one) indicates
> that no one was expecting this to be actually used.
>
> I also do not find any traces of the old way of assigning MSIs in qemu-kvm.
>

Okay.  There's some remote possibility that someone will pick up .29 and 
develop for it, but I think we can ignore that.  Applied.
diff mbox

Patch

diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index 2bd06b0..0ebe922 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.
 
 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/include/linux/kvm.h b/include/linux/kvm.h
index 55ef181..9c9ca7c 100644
--- a/include/linux/kvm.h
+++ b/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;