diff options
| -rw-r--r-- | arch/s390/kvm/intercept.c | 8 | ||||
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 2 | ||||
| -rw-r--r-- | include/asm-s390/kvm_host.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c index 47a0b642174c..f94da68a5c22 100644 --- a/arch/s390/kvm/intercept.c +++ b/arch/s390/kvm/intercept.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include "kvm-s390.h" | 20 | #include "kvm-s390.h" |
| 21 | #include "gaccess.h" | 21 | #include "gaccess.h" |
| 22 | 22 | ||
| 23 | static int handle_lctg(struct kvm_vcpu *vcpu) | 23 | static int handle_lctlg(struct kvm_vcpu *vcpu) |
| 24 | { | 24 | { |
| 25 | int reg1 = (vcpu->arch.sie_block->ipa & 0x00f0) >> 4; | 25 | int reg1 = (vcpu->arch.sie_block->ipa & 0x00f0) >> 4; |
| 26 | int reg3 = vcpu->arch.sie_block->ipa & 0x000f; | 26 | int reg3 = vcpu->arch.sie_block->ipa & 0x000f; |
| @@ -30,7 +30,7 @@ static int handle_lctg(struct kvm_vcpu *vcpu) | |||
| 30 | u64 useraddr; | 30 | u64 useraddr; |
| 31 | int reg, rc; | 31 | int reg, rc; |
| 32 | 32 | ||
| 33 | vcpu->stat.instruction_lctg++; | 33 | vcpu->stat.instruction_lctlg++; |
| 34 | if ((vcpu->arch.sie_block->ipb & 0xff) != 0x2f) | 34 | if ((vcpu->arch.sie_block->ipb & 0xff) != 0x2f) |
| 35 | return -ENOTSUPP; | 35 | return -ENOTSUPP; |
| 36 | 36 | ||
| @@ -40,7 +40,7 @@ static int handle_lctg(struct kvm_vcpu *vcpu) | |||
| 40 | 40 | ||
| 41 | reg = reg1; | 41 | reg = reg1; |
| 42 | 42 | ||
| 43 | VCPU_EVENT(vcpu, 5, "lctg r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2, | 43 | VCPU_EVENT(vcpu, 5, "lctlg r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2, |
| 44 | disp2); | 44 | disp2); |
| 45 | 45 | ||
| 46 | do { | 46 | do { |
| @@ -99,7 +99,7 @@ static intercept_handler_t instruction_handlers[256] = { | |||
| 99 | [0xae] = kvm_s390_handle_sigp, | 99 | [0xae] = kvm_s390_handle_sigp, |
| 100 | [0xb2] = kvm_s390_handle_priv, | 100 | [0xb2] = kvm_s390_handle_priv, |
| 101 | [0xb7] = handle_lctl, | 101 | [0xb7] = handle_lctl, |
| 102 | [0xeb] = handle_lctg, | 102 | [0xeb] = handle_lctlg, |
| 103 | }; | 103 | }; |
| 104 | 104 | ||
| 105 | static int handle_noop(struct kvm_vcpu *vcpu) | 105 | static int handle_noop(struct kvm_vcpu *vcpu) |
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index fcd41795b550..8b00eb2ddf57 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c | |||
| @@ -39,7 +39,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { | |||
| 39 | { "exit_instruction", VCPU_STAT(exit_instruction) }, | 39 | { "exit_instruction", VCPU_STAT(exit_instruction) }, |
| 40 | { "exit_program_interruption", VCPU_STAT(exit_program_interruption) }, | 40 | { "exit_program_interruption", VCPU_STAT(exit_program_interruption) }, |
| 41 | { "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) }, | 41 | { "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) }, |
| 42 | { "instruction_lctg", VCPU_STAT(instruction_lctg) }, | 42 | { "instruction_lctlg", VCPU_STAT(instruction_lctlg) }, |
| 43 | { "instruction_lctl", VCPU_STAT(instruction_lctl) }, | 43 | { "instruction_lctl", VCPU_STAT(instruction_lctl) }, |
| 44 | { "deliver_emergency_signal", VCPU_STAT(deliver_emergency_signal) }, | 44 | { "deliver_emergency_signal", VCPU_STAT(deliver_emergency_signal) }, |
| 45 | { "deliver_service_signal", VCPU_STAT(deliver_service_signal) }, | 45 | { "deliver_service_signal", VCPU_STAT(deliver_service_signal) }, |
diff --git a/include/asm-s390/kvm_host.h b/include/asm-s390/kvm_host.h index 6583c0d67757..3c55e4107dcc 100644 --- a/include/asm-s390/kvm_host.h +++ b/include/asm-s390/kvm_host.h | |||
| @@ -111,7 +111,7 @@ struct kvm_vcpu_stat { | |||
| 111 | u32 exit_validity; | 111 | u32 exit_validity; |
| 112 | u32 exit_instruction; | 112 | u32 exit_instruction; |
| 113 | u32 instruction_lctl; | 113 | u32 instruction_lctl; |
| 114 | u32 instruction_lctg; | 114 | u32 instruction_lctlg; |
| 115 | u32 exit_program_interruption; | 115 | u32 exit_program_interruption; |
| 116 | u32 exit_instr_and_program; | 116 | u32 exit_instr_and_program; |
| 117 | u32 deliver_emergency_signal; | 117 | u32 deliver_emergency_signal; |
