Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be6200aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Perform hardware_enable in CPU_STARTING callback
  KVM: i8259: fix migration
  KVM: fix i8259 oops when no vcpus are online
  KVM: x86 emulator: fix regression with cmpxchg8b on i386 hosts
parents f2955b49 da908f2f

arch/x86/include/asm/kvm_emulate.h

+6 −1
Original line number Diff line number Diff line
@@ -152,9 +152,14 @@ struct x86_emulate_ops { 
struct operand {

	enum { OP_REG, OP_MEM, OP_IMM, OP_NONE } type;

	unsigned int bytes;

	unsigned long orig_val, *ptr;

	union {

		unsigned long orig_val;

		u64 orig_val64;

	};

	unsigned long *ptr;

	union {

		unsigned long val;

		u64 val64;

		char valptr[sizeof(unsigned long) + 2];

	};

};

arch/x86/kvm/emulate.c

+4 −5
Original line number Diff line number Diff line
@@ -1870,16 +1870,15 @@ static inline int emulate_grp9(struct x86_emulate_ctxt *ctxt, 
			       struct x86_emulate_ops *ops)

{

	struct decode_cache *c = &ctxt->decode;

	u64 old = c->dst.orig_val;

	u64 old = c->dst.orig_val64;



	if (((u32) (old >> 0) != (u32) c->regs[VCPU_REGS_RAX]) ||

	    ((u32) (old >> 32) != (u32) c->regs[VCPU_REGS_RDX])) {



		c->regs[VCPU_REGS_RAX] = (u32) (old >> 0);

		c->regs[VCPU_REGS_RDX] = (u32) (old >> 32);

		ctxt->eflags &= ~EFLG_ZF;

	} else {

		c->dst.val = ((u64)c->regs[VCPU_REGS_RCX] << 32) |

		c->dst.val64 = ((u64)c->regs[VCPU_REGS_RCX] << 32) |

			(u32) c->regs[VCPU_REGS_RBX];



		ctxt->eflags |= EFLG_ZF;
@@ -2616,7 +2615,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
					c->src.valptr, c->src.bytes);

		if (rc != X86EMUL_CONTINUE)

			goto done;

		c->src.orig_val = c->src.val;

		c->src.orig_val64 = c->src.val64;

	}



	if (c->src2.type == OP_MEM) {

arch/x86/kvm/i8259.c

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ static void pic_unlock(struct kvm_pic *s) 
		if (!found)

			found = s->kvm->bsp_vcpu;



		if (!found)

			return;



		kvm_vcpu_kick(found);

	}

}

arch/x86/kvm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ struct kvm_kpic_state { 
	u8 irr;		/* interrupt request register */

	u8 imr;		/* interrupt mask register */

	u8 isr;		/* interrupt service register */

	u8 isr_ack;	/* interrupt ack detection */

	u8 priority_add;	/* highest irq priority */

	u8 irq_base;

	u8 read_reg_select;
@@ -56,6 +55,7 @@ struct kvm_kpic_state { 
	u8 init4;		/* true if 4 byte init */

	u8 elcr;		/* PIIX edge/trigger selection */

	u8 elcr_mask;

	u8 isr_ack;	/* interrupt ack detection */

	struct kvm_pic *pics_state;

};

virt/kvm/kvm_main.c

+2 −3
Original line number Diff line number Diff line
@@ -1958,10 +1958,10 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val, 
		       cpu);

		hardware_disable(NULL);

		break;

	case CPU_ONLINE:

	case CPU_STARTING:

		printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n",

		       cpu);

		smp_call_function_single(cpu, hardware_enable, NULL, 1);

		hardware_enable(NULL);

		break;

	}

	return NOTIFY_OK;
@@ -2096,7 +2096,6 @@ int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, 


static struct notifier_block kvm_cpu_notifier = {

	.notifier_call = kvm_cpu_hotplug,

	.priority = 20, /* must be > scheduler priority */

};



static int vm_stat_get(void *_offset, u64 *val)