diff mbox

[v1,05/11] KVM: x86: use generic function for MSI parsing

Message ID 20160630205429.16480-6-rkrcmar@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Radim Krčmář June 30, 2016, 8:54 p.m. UTC
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
 arch/x86/kvm/irq_comm.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

Comments

Paolo Bonzini July 1, 2016, 8:42 a.m. UTC | #1
On 30/06/2016 22:54, Radim Krčmář wrote:
> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
> ---
>  arch/x86/kvm/irq_comm.c | 17 ++++++-----------
>  1 file changed, 6 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
> index dfb4c6476877..47ad681a33fd 100644
> --- a/arch/x86/kvm/irq_comm.c
> +++ b/arch/x86/kvm/irq_comm.c
> @@ -388,21 +388,16 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,
>  			       kvm->arch.nr_reserved_ioapic_pins);
>  	for (i = 0; i < nr_ioapic_pins; ++i) {
>  		hlist_for_each_entry(entry, &table->map[i], link) {
> -			u32 dest_id, dest_mode;
> -			bool level;
> +			struct kvm_lapic_irq irq;
>  
>  			if (entry->type != KVM_IRQ_ROUTING_MSI)
>  				continue;
> -			dest_id = (entry->msi.address_lo >> 12) & 0xff;
> -			dest_mode = (entry->msi.address_lo >> 2) & 0x1;
> -			level = entry->msi.data & MSI_DATA_TRIGGER_LEVEL;
> -			if (level && kvm_apic_match_dest(vcpu, NULL, 0,
> -						dest_id, dest_mode)) {
> -				u32 vector = entry->msi.data & 0xff;
>  
> -				__set_bit(vector,
> -					  ioapic_handled_vectors);
> -			}
> +			kvm_set_msi_irq(entry, &irq);
> +
> +			if (irq.level && kvm_apic_match_dest(vcpu, NULL, 0,
> +						irq.dest_id, irq.dest_mode))
> +				__set_bit(irq.vector, ioapic_handled_vectors);
>  		}
>  	}
>  	srcu_read_unlock(&kvm->irq_srcu, idx);
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
index dfb4c6476877..47ad681a33fd 100644
--- a/arch/x86/kvm/irq_comm.c
+++ b/arch/x86/kvm/irq_comm.c
@@ -388,21 +388,16 @@  void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,
 			       kvm->arch.nr_reserved_ioapic_pins);
 	for (i = 0; i < nr_ioapic_pins; ++i) {
 		hlist_for_each_entry(entry, &table->map[i], link) {
-			u32 dest_id, dest_mode;
-			bool level;
+			struct kvm_lapic_irq irq;
 
 			if (entry->type != KVM_IRQ_ROUTING_MSI)
 				continue;
-			dest_id = (entry->msi.address_lo >> 12) & 0xff;
-			dest_mode = (entry->msi.address_lo >> 2) & 0x1;
-			level = entry->msi.data & MSI_DATA_TRIGGER_LEVEL;
-			if (level && kvm_apic_match_dest(vcpu, NULL, 0,
-						dest_id, dest_mode)) {
-				u32 vector = entry->msi.data & 0xff;
 
-				__set_bit(vector,
-					  ioapic_handled_vectors);
-			}
+			kvm_set_msi_irq(entry, &irq);
+
+			if (irq.level && kvm_apic_match_dest(vcpu, NULL, 0,
+						irq.dest_id, irq.dest_mode))
+				__set_bit(irq.vector, ioapic_handled_vectors);
 		}
 	}
 	srcu_read_unlock(&kvm->irq_srcu, idx);