Commit a74b7d55 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-next-20141001' of... 

Merge tag 'kvm-s390-next-20141001' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next

KVM: s390: Small enhancements for 3.18 (next)

Provide TOD CLOCK steering to the guest and add cpu wakeup counter.
parents cec26bc3 ce2e4f0b

arch/s390/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ struct kvm_vcpu_stat { 
	u32 exit_stop_request;

	u32 exit_validity;

	u32 exit_instruction;

	u32 halt_wakeup;

	u32 instruction_lctl;

	u32 instruction_lctlg;

	u32 instruction_stctl;

arch/s390/kvm/interrupt.c

+1 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu) 
		 */

		vcpu->preempted = true;

		wake_up_interruptible(&vcpu->wq);

		vcpu->stat.halt_wakeup++;

	}

}

arch/s390/kvm/kvm-s390.c

+2 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
	{ "exit_instruction", VCPU_STAT(exit_instruction) },

	{ "exit_program_interruption", VCPU_STAT(exit_program_interruption) },

	{ "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) },

	{ "halt_wakeup", VCPU_STAT(halt_wakeup) },

	{ "instruction_lctlg", VCPU_STAT(instruction_lctlg) },

	{ "instruction_lctl", VCPU_STAT(instruction_lctl) },

	{ "instruction_stctl", VCPU_STAT(instruction_stctl) },
@@ -1786,7 +1787,7 @@ static int __init kvm_s390_init(void) 
		return -ENOMEM;

	}

	memcpy(vfacilities, S390_lowcore.stfle_fac_list, 16);

	vfacilities[0] &= 0xff82fff3f4fc2000UL;

	vfacilities[0] &= 0xff82fffbf47c2000UL;

	vfacilities[1] &= 0x005c000000000000UL;

	return 0;

}