Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
KVM: s390: Fix instruction naming for lctlg
Lets fix the name for the lctlg instruction...
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
authored by
Christian Borntraeger
and committed by
Avi Kivity
f5e10b09
3cd61299
+4
-4
arch/s390/kvm/intercept.c
+4
-4
arch/s390/kvm/intercept.c
···
20
#include "kvm-s390.h"
21
#include "gaccess.h"
22
23
-
static int handle_lctg(struct kvm_vcpu *vcpu)
24
{
25
int reg1 = (vcpu->arch.sie_block->ipa & 0x00f0) >> 4;
26
int reg3 = vcpu->arch.sie_block->ipa & 0x000f;
···
30
u64 useraddr;
31
int reg, rc;
32
33
-
vcpu->stat.instruction_lctg++;
34
if ((vcpu->arch.sie_block->ipb & 0xff) != 0x2f)
35
return -ENOTSUPP;
36
···
40
41
reg = reg1;
42
43
-
VCPU_EVENT(vcpu, 5, "lctg r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2,
44
disp2);
45
46
do {
···
99
[0xae] = kvm_s390_handle_sigp,
100
[0xb2] = kvm_s390_handle_priv,
101
[0xb7] = handle_lctl,
102
-
[0xeb] = handle_lctg,
103
};
104
105
static int handle_noop(struct kvm_vcpu *vcpu)
···
20
#include "kvm-s390.h"
21
#include "gaccess.h"
22
23
+
static int handle_lctlg(struct kvm_vcpu *vcpu)
24
{
25
int reg1 = (vcpu->arch.sie_block->ipa & 0x00f0) >> 4;
26
int reg3 = vcpu->arch.sie_block->ipa & 0x000f;
···
30
u64 useraddr;
31
int reg, rc;
32
33
+
vcpu->stat.instruction_lctlg++;
34
if ((vcpu->arch.sie_block->ipb & 0xff) != 0x2f)
35
return -ENOTSUPP;
36
···
40
41
reg = reg1;
42
43
+
VCPU_EVENT(vcpu, 5, "lctlg r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2,
44
disp2);
45
46
do {
···
99
[0xae] = kvm_s390_handle_sigp,
100
[0xb2] = kvm_s390_handle_priv,
101
[0xb7] = handle_lctl,
102
+
[0xeb] = handle_lctlg,
103
};
104
105
static int handle_noop(struct kvm_vcpu *vcpu)
+1
-1
arch/s390/kvm/kvm-s390.c
+1
-1
arch/s390/kvm/kvm-s390.c
···
39
{ "exit_instruction", VCPU_STAT(exit_instruction) },
40
{ "exit_program_interruption", VCPU_STAT(exit_program_interruption) },
41
{ "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) },
42
-
{ "instruction_lctg", VCPU_STAT(instruction_lctg) },
43
{ "instruction_lctl", VCPU_STAT(instruction_lctl) },
44
{ "deliver_emergency_signal", VCPU_STAT(deliver_emergency_signal) },
45
{ "deliver_service_signal", VCPU_STAT(deliver_service_signal) },
···
39
{ "exit_instruction", VCPU_STAT(exit_instruction) },
40
{ "exit_program_interruption", VCPU_STAT(exit_program_interruption) },
41
{ "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) },
42
+
{ "instruction_lctlg", VCPU_STAT(instruction_lctlg) },
43
{ "instruction_lctl", VCPU_STAT(instruction_lctl) },
44
{ "deliver_emergency_signal", VCPU_STAT(deliver_emergency_signal) },
45
{ "deliver_service_signal", VCPU_STAT(deliver_service_signal) },
+1
-1
include/asm-s390/kvm_host.h
+1
-1
include/asm-s390/kvm_host.h