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

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

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

* 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (70 commits)
  KVM: Adjust smp_call_function_mask() callers to new requirements
  KVM: MMU: Fix potential race setting upper shadow ptes on nonpae hosts
  KVM: x86 emulator: emulate clflush
  KVM: MMU: improve invalid shadow root page handling
  KVM: MMU: nuke shadowed pgtable pages and ptes on memslot destruction
  KVM: Prefix some x86 low level function with kvm_, to avoid namespace issues
  KVM: check injected pic irq within valid pic irqs
  KVM: x86 emulator: Fix HLT instruction
  KVM: Apply the kernel sigmask to vcpus blocked due to being uninitialized
  KVM: VMX: Add ept_sync_context in flush_tlb
  KVM: mmu_shrink: kvm_mmu_zap_page requires slots_lock to be held
  x86: KVM guest: make kvm_smp_prepare_boot_cpu() static
  KVM: SVM: fix suspend/resume support
  KVM: s390: rename private structures
  KVM: s390: Set guest storage limit and offset to sane values
  KVM: Fix memory leak on guest exit
  KVM: s390: dont allocate dirty bitmap
  KVM: move slots_lock acquision down to vapic_exit
  KVM: VMX: Fake emulate Intel perfctr MSRs
  KVM: VMX: Fix a wrong usage of vmcs_config
  ...
parents db6d8c7a 597a5f55

arch/ia64/kvm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s 
EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/

EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/



common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o)

common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

		coalesced_mmio.o)



kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o

obj-$(CONFIG_KVM) += kvm.o

arch/ia64/kvm/kvm-ia64.c

+9 −11
Original line number Diff line number Diff line
@@ -187,6 +187,9 @@ int kvm_dev_ioctl_check_extension(long ext) 


		r = 1;

		break;

	case KVM_CAP_COALESCED_MMIO:

		r = KVM_COALESCED_MMIO_PAGE_OFFSET;

		break;

	default:

		r = 0;

	}
@@ -195,11 +198,11 @@ int kvm_dev_ioctl_check_extension(long ext) 
}



static struct kvm_io_device *vcpu_find_mmio_dev(struct kvm_vcpu *vcpu,

					gpa_t addr)

					gpa_t addr, int len, int is_write)

{

	struct kvm_io_device *dev;



	dev = kvm_io_bus_find_dev(&vcpu->kvm->mmio_bus, addr);

	dev = kvm_io_bus_find_dev(&vcpu->kvm->mmio_bus, addr, len, is_write);



	return dev;

}
@@ -231,7 +234,7 @@ static int handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	kvm_run->exit_reason = KVM_EXIT_MMIO;

	return 0;

mmio:

	mmio_dev = vcpu_find_mmio_dev(vcpu, p->addr);

	mmio_dev = vcpu_find_mmio_dev(vcpu, p->addr, p->size, !p->dir);

	if (mmio_dev) {

		if (!p->dir)

			kvm_iodevice_write(mmio_dev, p->addr, p->size,
@@ -1035,14 +1038,6 @@ static void kvm_free_vmm_area(void) 
	}

}



/*

 * Make sure that a cpu that is being hot-unplugged does not have any vcpus

 * cached on it. Leave it as blank for IA64.

 */

void decache_vcpus_on_cpu(int cpu)

{

}



static void vti_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

{

}
@@ -1460,6 +1455,9 @@ int kvm_arch_set_memory_region(struct kvm *kvm, 
	return 0;

}



void kvm_arch_flush_shadow(struct kvm *kvm)

{

}



long kvm_arch_dev_ioctl(struct file *filp,

		unsigned int ioctl, unsigned long arg)

arch/powerpc/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


EXTRA_CFLAGS += -Ivirt/kvm -Iarch/powerpc/kvm



common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)

common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o)



kvm-objs := $(common-objs) powerpc.o emulate.o booke_guest.o

obj-$(CONFIG_KVM) += kvm.o

arch/powerpc/kvm/powerpc.c

+7 −4
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ int kvm_dev_ioctl_check_extension(long ext) 
	case KVM_CAP_USER_MEMORY:

		r = 1;

		break;

	case KVM_CAP_COALESCED_MMIO:

		r = KVM_COALESCED_MMIO_PAGE_OFFSET;

		break;

	default:

		r = 0;

		break;
@@ -167,6 +170,10 @@ int kvm_arch_set_memory_region(struct kvm *kvm, 
	return 0;

}



void kvm_arch_flush_shadow(struct kvm *kvm)

{

}



struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)

{

	struct kvm_vcpu *vcpu;
@@ -240,10 +247,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) 
{

}



void decache_vcpus_on_cpu(int cpu)

{

}



int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu,

                                    struct kvm_debug_guest *dbg)

{

arch/s390/kvm/interrupt.c

+16 −16
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static int psw_interrupts_disabled(struct kvm_vcpu *vcpu) 
}



static int __interrupt_is_deliverable(struct kvm_vcpu *vcpu,

				      struct interrupt_info *inti)

				      struct kvm_s390_interrupt_info *inti)

{

	switch (inti->type) {

	case KVM_S390_INT_EMERGENCY:
@@ -91,7 +91,7 @@ static void __set_cpuflag(struct kvm_vcpu *vcpu, u32 flag) 
}



static void __set_intercept_indicator(struct kvm_vcpu *vcpu,

				      struct interrupt_info *inti)

				      struct kvm_s390_interrupt_info *inti)

{

	switch (inti->type) {

	case KVM_S390_INT_EMERGENCY:
@@ -111,7 +111,7 @@ static void __set_intercept_indicator(struct kvm_vcpu *vcpu, 
}



static void __do_deliver_interrupt(struct kvm_vcpu *vcpu,

				   struct interrupt_info *inti)

				   struct kvm_s390_interrupt_info *inti)

{

	const unsigned short table[] = { 2, 4, 4, 6 };

	int rc, exception = 0;
@@ -290,9 +290,9 @@ static int __try_deliver_ckc_interrupt(struct kvm_vcpu *vcpu) 


int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu)

{

	struct local_interrupt *li = &vcpu->arch.local_int;

	struct float_interrupt *fi = vcpu->arch.local_int.float_int;

	struct interrupt_info  *inti;

	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;

	struct kvm_s390_float_interrupt *fi = vcpu->arch.local_int.float_int;

	struct kvm_s390_interrupt_info  *inti;

	int rc = 0;



	if (atomic_read(&li->active)) {
@@ -408,9 +408,9 @@ void kvm_s390_idle_wakeup(unsigned long data) 


void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu)

{

	struct local_interrupt *li = &vcpu->arch.local_int;

	struct float_interrupt *fi = vcpu->arch.local_int.float_int;

	struct interrupt_info  *n, *inti = NULL;

	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;

	struct kvm_s390_float_interrupt *fi = vcpu->arch.local_int.float_int;

	struct kvm_s390_interrupt_info  *n, *inti = NULL;

	int deliver;



	__reset_intercept_indicators(vcpu);
@@ -465,8 +465,8 @@ void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu) 


int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code)

{

	struct local_interrupt *li = &vcpu->arch.local_int;

	struct interrupt_info *inti;

	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;

	struct kvm_s390_interrupt_info *inti;



	inti = kzalloc(sizeof(*inti), GFP_KERNEL);

	if (!inti)
@@ -487,9 +487,9 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code) 
int kvm_s390_inject_vm(struct kvm *kvm,

		       struct kvm_s390_interrupt *s390int)

{

	struct local_interrupt *li;

	struct float_interrupt *fi;

	struct interrupt_info *inti;

	struct kvm_s390_local_interrupt *li;

	struct kvm_s390_float_interrupt *fi;

	struct kvm_s390_interrupt_info *inti;

	int sigcpu;



	inti = kzalloc(sizeof(*inti), GFP_KERNEL);
@@ -544,8 +544,8 @@ int kvm_s390_inject_vm(struct kvm *kvm, 
int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,

			 struct kvm_s390_interrupt *s390int)

{

	struct local_interrupt *li;

	struct interrupt_info *inti;

	struct kvm_s390_local_interrupt *li;

	struct kvm_s390_interrupt_info *inti;



	inti = kzalloc(sizeof(*inti), GFP_KERNEL);

	if (!inti)