Re: linux-next: manual merge of the kvm-arm tree with Linus' tree

[Christoffer Dall]

Hi Stephen,

On Wed, Mar 18, 2015 at 02:41:11PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvm-arm tree got a conflict in
> virt/kvm/arm/vgic.c between commit ae705930fca6 ("arm/arm64: KVM: Keep
> elrsr/aisr in sync with software model") from Linus' tree and commit
> 71760950bf3d ("arm/arm64: KVM: add a common vgic_queue_irq_to_lr fn")
> from the kvm-arm tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc virt/kvm/arm/vgic.c
> index c9f60f524588,ffd937ca5141..000000000000
> --- a/virt/kvm/arm/vgic.c
> +++ b/virt/kvm/arm/vgic.c
> @@@ -982,9 -1092,7 +1098,8 @@@ bool vgic_queue_irq(struct kvm_vcpu *vc
>   		if (vlr.source == sgi_source_id) {
>   			kvm_debug("LR%d piggyback for IRQ%d\n", lr, vlr.irq);
>   			BUG_ON(!test_bit(lr, vgic_cpu->lr_used));
> - 			vlr.state |= LR_STATE_PENDING;
> - 			vgic_set_lr(vcpu, lr, vlr);
> + 			vgic_queue_irq_to_lr(vcpu, irq, lr, vlr);
>  +			vgic_sync_lr_elrsr(vcpu, lr, vlr);
>   			return true;
>   		}
>   	}
> @@@ -1001,12 -1109,8 +1116,9 @@@
>   
>   	vlr.irq = irq;
>   	vlr.source = sgi_source_id;
> - 	vlr.state = LR_STATE_PENDING;
> - 	if (!vgic_irq_is_edge(vcpu, irq))
> - 		vlr.state |= LR_EOI_INT;
> - 
> - 	vgic_set_lr(vcpu, lr, vlr);
> + 	vlr.state = 0;
> + 	vgic_queue_irq_to_lr(vcpu, irq, lr, vlr);
>  +	vgic_sync_lr_elrsr(vcpu, lr, vlr);
>   
>   	return true;
>   }


Looks great, thanks!
-Christoffer

Attachment: signature.asc
Description: Digital signature