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

Commit f5e10b09 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Avi Kivity
Browse files

KVM: s390: Fix instruction naming for lctlg 



Lets fix the name for the lctlg instruction...

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 3cd61299

arch/s390/kvm/intercept.c

+4 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "kvm-s390.h"

#include "gaccess.h"



static int handle_lctg(struct kvm_vcpu *vcpu)

static int handle_lctlg(struct kvm_vcpu *vcpu)

{

	int reg1 = (vcpu->arch.sie_block->ipa & 0x00f0) >> 4;

	int reg3 = vcpu->arch.sie_block->ipa & 0x000f;
@@ -30,7 +30,7 @@ static int handle_lctg(struct kvm_vcpu *vcpu) 
	u64 useraddr;

	int reg, rc;



	vcpu->stat.instruction_lctg++;

	vcpu->stat.instruction_lctlg++;

	if ((vcpu->arch.sie_block->ipb & 0xff) != 0x2f)

		return -ENOTSUPP;
@@ -40,7 +40,7 @@ static int handle_lctg(struct kvm_vcpu *vcpu) 


	reg = reg1;



	VCPU_EVENT(vcpu, 5, "lctg r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2,

	VCPU_EVENT(vcpu, 5, "lctlg r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2,

		   disp2);



	do {
@@ -99,7 +99,7 @@ static intercept_handler_t instruction_handlers[256] = { 
	[0xae] = kvm_s390_handle_sigp,

	[0xb2] = kvm_s390_handle_priv,

	[0xb7] = handle_lctl,

	[0xeb] = handle_lctg,

	[0xeb] = handle_lctlg,

};



static int handle_noop(struct kvm_vcpu *vcpu)

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,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) },

	{ "instruction_lctg", VCPU_STAT(instruction_lctg) },

	{ "instruction_lctlg", VCPU_STAT(instruction_lctlg) },

	{ "instruction_lctl", VCPU_STAT(instruction_lctl) },

	{ "deliver_emergency_signal", VCPU_STAT(deliver_emergency_signal) },

	{ "deliver_service_signal", VCPU_STAT(deliver_service_signal) },

include/asm-s390/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct kvm_vcpu_stat { 
	u32 exit_validity;

	u32 exit_instruction;

	u32 instruction_lctl;

	u32 instruction_lctg;

	u32 instruction_lctlg;

	u32 exit_program_interruption;

	u32 exit_instr_and_program;

	u32 deliver_emergency_signal;