Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: LAPIC: ignore pending timers if LVTT is disabled
  KVM: Update MAINTAINERS for new mailing lists
  KVM: Fix kvm_vcpu_block() task state race
  KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48
  KVM: ia64: fix GVMM module including position-dependent objects
  KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg
  KVM: PIT: take inject_pending into account when emulating hlt
  s390: KVM guest: fix compile error
  KVM: x86 emulator: fix writes to registers with modrm encodings

11 files changed, 65 insertions, 47 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 915ad48d8bce..36e330c6f183 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2352,24 +2352,24 @@ S:	Supported
 KERNEL VIRTUAL MACHINE (KVM)
 P:      Avi Kivity
 M:      avi@qumranet.com
-L:      kvm-devel@lists.sourceforge.net
-W:      kvm.sourceforge.net
+L:      kvm@vger.kernel.org
+W:      http://kvm.qumranet.com
 S:      Supported
 
 KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 P:      Hollis Blanchard
 M:      hollisb@us.ibm.com
-L:      kvm-ppc-devel@lists.sourceforge.net
-W:      kvm.sourceforge.net
+L:      kvm-ppc@vger.kernel.org
+W:      http://kvm.qumranet.com
 S:      Supported
 
-KERNEL VIRTUAL MACHINE For Itanium(KVM/IA64)
+KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)
 P:      Anthony Xu
 M:      anthony.xu@intel.com
 P:      Xiantao Zhang
 M:      xiantao.zhang@intel.com
-L:      kvm-ia64-devel@lists.sourceforge.net
-W:      kvm.sourceforge.net
+L:      kvm-ia64@vger.kernel.org
+W:      http://kvm.qumranet.com
 S:      Supported
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index 52353397a1a4..112791dd2542 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -7,7 +7,6 @@ offsets-file := asm-offsets.h
 always  := $(offsets-file)
 targets := $(offsets-file)
 targets += arch/ia64/kvm/asm-offsets.s
-clean-files := $(addprefix $(objtree)/,$(targets) $(obj)/memcpy.S $(obj)/memset.S)
 
 # Default sed regexp - multiline due to syntax constraints
 define sed-y
@@ -54,5 +53,5 @@ 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
 #Add link memcpy and memset to avoid possible structure assignment error
-kvm-intel-objs += ../lib/memset.o ../lib/memcpy.o
+kvm-intel-objs += memcpy.o memset.o
 obj-$(CONFIG_KVM_INTEL) += kvm-intel.o
diff --git a/arch/ia64/kvm/memcpy.S b/arch/ia64/kvm/memcpy.S
new file mode 100644
index 000000000000..c04cdbe9f80f
--- /dev/null
+++ b/arch/ia64/kvm/memcpy.S
@@ -0,0 +1 @@
+#include "../lib/memcpy.S"
diff --git a/arch/ia64/kvm/memset.S b/arch/ia64/kvm/memset.S
new file mode 100644
index 000000000000..83c3066d844a
--- /dev/null
+++ b/arch/ia64/kvm/memset.S
@@ -0,0 +1 @@
+#include "../lib/memset.S"
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 3324d90038e4..7c077a9d9777 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -216,7 +216,7 @@ int pit_has_pending_timer(struct kvm_vcpu *vcpu)
 {
         struct kvm_pit *pit = vcpu->kvm->arch.vpit;
 
-        if (pit && vcpu->vcpu_id == 0)
+        if (pit && vcpu->vcpu_id == 0 && pit->pit_state.inject_pending)
                 return atomic_read(&pit->pit_state.pit_timer.pending);
 
         return 0;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 36809d79788b..c297c50eba63 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -957,7 +957,7 @@ int apic_has_pending_timer(struct kvm_vcpu *vcpu)
 {
         struct kvm_lapic *lapic = vcpu->arch.apic;
 
-        if (lapic)
+        if (lapic && apic_enabled(lapic) && apic_lvt_enabled(lapic, APIC_LVTT))
                 return atomic_read(&lapic->timer.pending);
 
         return 0;
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index f2a696d6a243..8a96320ab071 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -677,8 +677,9 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
         c->use_modrm_ea = 1;
 
         if (c->modrm_mod == 3) {
-                c->modrm_val = *(unsigned long *)
-                        decode_register(c->modrm_rm, c->regs, c->d & ByteOp);
+                c->modrm_ptr = decode_register(c->modrm_rm,
+                                               c->regs, c->d & ByteOp);
+                c->modrm_val = *(unsigned long *)c->modrm_ptr;
                 return rc;
         }
 
@@ -1005,6 +1006,7 @@ done_prefixes:
                 if ((c->d & ModRM) && c->modrm_mod == 3) {
                         c->src.type = OP_REG;
                         c->src.val = c->modrm_val;
+                        c->src.ptr = c->modrm_ptr;
                         break;
                 }
                 c->src.type = OP_MEM;
@@ -1049,6 +1051,7 @@ done_prefixes:
                 if ((c->d & ModRM) && c->modrm_mod == 3) {
                         c->dst.type = OP_REG;
                         c->dst.val = c->dst.orig_val = c->modrm_val;
+                        c->dst.ptr = c->modrm_ptr;
                         break;
                 }
                 c->dst.type = OP_MEM;
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index 47a7e6200b26..9f55ce6f3c78 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -78,27 +78,32 @@ static unsigned desc_size(const struct kvm_device_desc *desc)
                 + desc->config_len;
 }
 
-/*
- * This tests (and acknowleges) a feature bit.
- */
-static bool kvm_feature(struct virtio_device *vdev, unsigned fbit)
+/* This gets the device's feature bits. */
+static u32 kvm_get_features(struct virtio_device *vdev)
 {
+        unsigned int i;
+        u32 features = 0;
         struct kvm_device_desc *desc = to_kvmdev(vdev)->desc;
-        u8 *features;
+        u8 *in_features = kvm_vq_features(desc);
 
-        if (fbit / 8 > desc->feature_len)
-                return false;
+        for (i = 0; i < min(desc->feature_len * 8, 32); i++)
+                if (in_features[i / 8] & (1 << (i % 8)))
+                        features |= (1 << i);
+        return features;
+}
 
-        features = kvm_vq_features(desc);
-        if (!(features[fbit / 8] & (1 << (fbit % 8))))
-                return false;
+static void kvm_set_features(struct virtio_device *vdev, u32 features)
+{
+        unsigned int i;
+        struct kvm_device_desc *desc = to_kvmdev(vdev)->desc;
+        /* Second half of bitmap is features we accept. */
+        u8 *out_features = kvm_vq_features(desc) + desc->feature_len;
 
-        /*
-         * We set the matching bit in the other half of the bitmap to tell the
-         * Host we want to use this feature.
-         */
+        memset(out_features, 0, desc->feature_len);
+        for (i = 0; i < min(desc->feature_len * 8, 32); i++) {
+                if (features & (1 << i))
+                        out_features[i / 8] |= (1 << (i % 8));