Re: [PATCH 2/2] virtio-s390: Change virtio interrupt definitions to follow architecture

[Christian Borntraeger <borntraeger@de.ibm.com>]

Am Donnerstag, 17. April 2008 schrieb Avi Kivity:
> Don't you need to change KVM_S390_INT_VIRTIO as well?

Good catch.
It works without that change, but its cleaner to change that. We can also 
remove another fixme, as the host interrupt uses the same control register 
bit 9.

Can you merge this into the first patch?

Christian

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Carsten Otte <cotte@de.ibm.com>

---
 arch/s390/kvm/interrupt.c |    2 +-
 include/linux/kvm.h       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: kvm/arch/s390/kvm/interrupt.c
===================================================================
--- kvm.orig/arch/s390/kvm/interrupt.c
+++ kvm/arch/s390/kvm/interrupt.c
@@ -50,7 +50,7 @@ static int __interrupt_is_deliverable(st
 		if (psw_extint_disabled(vcpu))
 			return 0;
 		if (vcpu->arch.sie_block->gcr[0] & 0x200ul)
-			return 1; /*FIXME virtio control register bit */
+			return 1;
 		return 0;
 	case KVM_S390_PROGRAM_INT:
 	case KVM_S390_SIGP_STOP:
Index: kvm/include/linux/kvm.h
===================================================================
--- kvm.orig/include/linux/kvm.h
+++ kvm/include/linux/kvm.h
@@ -250,7 +250,7 @@ struct kvm_s390_psw {
 #define KVM_S390_PROGRAM_INT		0xfffe0001u
 #define KVM_S390_SIGP_SET_PREFIX	0xfffe0002u
 #define KVM_S390_RESTART		0xfffe0003u
-#define KVM_S390_INT_VIRTIO		0xffff1237u /*FIXME arch number */
+#define KVM_S390_INT_VIRTIO		0xffff2603u
 #define KVM_S390_INT_SERVICE		0xffff2401u
 #define KVM_S390_INT_EMERGENCY		0xffff1201u
 


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone