KVM: Fix incorrect KVM_USERSPACE_IRQ_SOURCE_ID

(When I am curious how this have been fixed without any patch, I just saw the add-on fix is from Xiantao, and was reverted along with the other part of that patch...)

---
 include/linux/kvm_host.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 1658228..bb92be2 100644
@@ -37,7 +37,7 @@
 #define KVM_REQ_UNHALT             6
 #define KVM_REQ_MMU_SYNC           7
 
-#define KVM_USERSPACE_IRQ_SOURCE_ID	(1 << 0)
+#define KVM_USERSPACE_IRQ_SOURCE_ID	0
 
 struct kvm_vcpu;
 extern struct kmem_cache *kvm_vcpu_cache;

1.5.4.5

I edited the patch before pushing it out.

Thanks for the fix; applied. Xiantao, please be more careful.

I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

Hi, Avi
I am also curious about this issue. In my original patch, it doesn't include this stuff, but don't know why it is in this commit. Attached my original patch :)
Thanks
Xiantao

From: Xiantao Zhang <[email protected]>
Date: Mon, 13 Oct 2008 18:37:49 +0800
Subject: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h

To avoid using stale asm-offsets.h.

---
 arch/ia64/kvm/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

index bf22fb9..39e742b 100644
@@ -30,7 +30,7 @@ define cmd_offsets
         echo "#endif" ) > $@
 endef
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c FORCE
        $(call if_changed_dep,cc_s_c)
 
 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s

@@ -49,7 +49,6 @@ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o
 
-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
        vtlb.o process.o

--
1.5.1

Then it's probably my fault. I probably had some garbage in the git index which got merged into the patch when applying. Sorry.

I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.