public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Avi Kivity <avi@qumranet.com>
Cc: kvm <kvm@vger.kernel.org>, Olaf Schnapper <os@de.ibm.com>,
	Carsten Otte <cotte@de.ibm.com>
Subject: [PATCH 5/6] kvm-s390: Fix instruction naming for lctlg
Date: Fri, 25 Jul 2008 15:52:44 +0200	[thread overview]
Message-ID: <200807251552.44945.borntraeger@de.ibm.com> (raw)
In-Reply-To: <200807251547.44296.borntraeger@de.ibm.com>

From: Christian Borntraeger <borntraeger@de.ibm.com>

Lets fix the name for the lctlg instruction...

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 arch/s390/kvm/intercept.c   |    8 ++++----
 arch/s390/kvm/kvm-s390.c    |    2 +-
 include/asm-s390/kvm_host.h |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

Index: kvm/arch/s390/kvm/intercept.c
===================================================================
--- kvm.orig/arch/s390/kvm/intercept.c
+++ kvm/arch/s390/kvm/intercept.c
@@ -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 *
 	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 *
 
 	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_h
 	[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)
Index: kvm/arch/s390/kvm/kvm-s390.c
===================================================================
--- kvm.orig/arch/s390/kvm/kvm-s390.c
+++ kvm/arch/s390/kvm/kvm-s390.c
@@ -39,7 +39,7 @@ struct kvm_stats_debugfs_item debugfs_en
 	{ "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) },
Index: kvm/include/asm-s390/kvm_host.h
===================================================================
--- kvm.orig/include/asm-s390/kvm_host.h
+++ kvm/include/asm-s390/kvm_host.h
@@ -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;

  parent reply	other threads:[~2008-07-25 13:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-25 13:47 [PATCH 0/6] kvm-s390: Multiple fixes for kvm on s390 Christian Borntraeger
2008-07-25 13:49 ` [PATCH 1/6] kvm-s390: Advertise KVM_CAP_USER_MEMORY Christian Borntraeger
2008-07-25 13:50 ` [PATCH 2/6] kvm-s390: Fix guest kconfig Christian Borntraeger
2008-07-25 13:51 ` [PATCH 3/6] kvm-s390: Change guestaddr type in gaccess Christian Borntraeger
2008-07-25 13:51 ` [PATCH 4/6] kvm-s390: Fix program check on interrupt delivery handling Christian Borntraeger
2008-07-25 13:52 ` Christian Borntraeger [this message]
2008-07-25 13:53 ` [PATCH] kvm-s390: Fix possible host kernel bug on lctl(g) handling Christian Borntraeger
2008-07-27  7:49 ` [PATCH 0/6] kvm-s390: Multiple fixes for kvm on s390 Avi Kivity

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200807251552.44945.borntraeger@de.ibm.com \
    --to=borntraeger@de.ibm.com \
    --cc=avi@qumranet.com \
    --cc=cotte@de.ibm.com \
    --cc=kvm@vger.kernel.org \
    --cc=os@de.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox