Merge commit 'origin/next' into kvm-ppc-next (fca7567c) · Commits · e / devices / android_kernel_teracube_2e

arch/arm/kvm/arm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -805,7 +805,8 @@ static int vcpu_interrupt_line(struct kvm_vcpu *vcpu, int number, bool level)
		return 0;
		}

		int kvm_vm_ioctl_irq_line(struct kvm kvm, struct kvm_irq_level irq_level)
		int kvm_vm_ioctl_irq_line(struct kvm kvm, struct kvm_irq_level irq_level,
		bool line_status)
		{
		u32 irq = irq_level->irq;
		unsigned int irq_type, vcpu_idx, irq_num;

arch/ia64/kvm/lapic.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -27,10 +27,4 @@ int kvm_apic_set_irq(struct kvm_vcpu vcpu, struct kvm_lapic_irq irq);
		#define kvm_apic_present(x) (true)
		#define kvm_lapic_enabled(x) (true)

		static inline bool kvm_apic_vid_enabled(void)
		{
		/* IA64 has no apicv supporting, do nothing here */
		return false;
		}

		#endif

arch/s390/kvm/intercept.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -45,10 +45,8 @@ static int handle_lctlg(struct kvm_vcpu *vcpu)
		do {
		rc = get_guest(vcpu, vcpu->arch.sie_block->gcr[reg],
		(u64 __user *) useraddr);
		if (rc) {
		kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
		break;
		}
		if (rc)
		return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
		useraddr += 8;
		if (reg == reg3)
		break;
		@@ -79,10 +77,8 @@ static int handle_lctl(struct kvm_vcpu *vcpu)
		reg = reg1;
		do {
		rc = get_guest(vcpu, val, (u32 __user *) useraddr);
		if (rc) {
		kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
		break;
		}
		if (rc)
		return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
		vcpu->arch.sie_block->gcr[reg] &= 0xffffffff00000000ul;
		vcpu->arch.sie_block->gcr[reg] \|= val;
		useraddr += 4;

arch/s390/kvm/kvm-s390.c

+18 −14

Original line number	Diff line number	Diff line
		@@ -149,6 +149,9 @@ int kvm_dev_ioctl_check_extension(long ext)
		case KVM_CAP_MAX_VCPUS:
		r = KVM_MAX_VCPUS;
		break;
		case KVM_CAP_NR_MEMSLOTS:
		r = KVM_USER_MEM_SLOTS;
		break;
		case KVM_CAP_S390_COW:
		r = MACHINE_HAS_ESOP;
		break;
		@@ -633,8 +636,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
		} else {
		VCPU_EVENT(vcpu, 3, "%s", "fault in sie instruction");
		trace_kvm_s390_sie_fault(vcpu);
		kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
		rc = 0;
		rc = kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
		}
		}
		VCPU_EVENT(vcpu, 6, "exit sie icptcode %d",
		@@ -978,18 +980,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
		struct kvm_userspace_memory_region *mem,
		enum kvm_mr_change change)
		{
		/* A few sanity checks. We can have exactly one memory slot which has
		to start at guest virtual zero and which has to be located at a
		page boundary in userland and which has to end at a page boundary.
		The memory in userland is ok to be fragmented into various different
		vmas. It is okay to mmap() and munmap() stuff in this slot after
		doing this call at any time */

		if (mem->slot)
		return -EINVAL;

		if (mem->guest_phys_addr)
		return -EINVAL;
		/* A few sanity checks. We can have memory slots which have to be
		located/ended at a segment boundary (1MB). The memory in userland is
		ok to be fragmented into various different vmas. It is okay to mmap()
		and munmap() stuff in this slot after doing this call at any time */

		if (mem->userspace_addr & 0xffffful)
		return -EINVAL;
		@@ -1007,6 +1001,16 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
		{
		int rc;

		/* If the basics of the memslot do not change, we do not want
		* to update the gmap. Every update causes several unnecessary
		* segment translation exceptions. This is usually handled just
		* fine by the normal fault handler + gmap, but it will also
		* cause faults on the prefix page of running guest CPUs.
		*/
		if (old->userspace_addr == mem->userspace_addr &&
		old->base_gfn * PAGE_SIZE == mem->guest_phys_addr &&
		old->npages * PAGE_SIZE == mem->memory_size)
		return;

		rc = gmap_map_segment(kvm->arch.gmap, mem->userspace_addr,
		mem->guest_phys_addr, mem->memory_size);

arch/s390/kvm/kvm-s390.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -110,12 +110,12 @@ enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer);
		void kvm_s390_tasklet(unsigned long parm);
		void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu);
		void kvm_s390_deliver_pending_machine_checks(struct kvm_vcpu *vcpu);
		int kvm_s390_inject_vm(struct kvm *kvm,
		int __must_check kvm_s390_inject_vm(struct kvm *kvm,
		struct kvm_s390_interrupt *s390int);
		int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,
		int __must_check kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,
		struct kvm_s390_interrupt *s390int);
		int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code);
		int kvm_s390_inject_sigp_stop(struct kvm_vcpu *vcpu, int action);
		int __must_check kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code);
		int __must_check kvm_s390_inject_sigp_stop(struct kvm_vcpu *vcpu, int action);
		struct kvm_s390_interrupt_info kvm_s390_get_io_int(struct kvm kvm,
		u64 cr6, u64 schid);