From: Cornelia Huck <cornelia.huck@de.ibm.com>
To: Gleb Natapov <gleb@kernel.org>, Paolo Bonzini <pbonzini@redhat.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
kvm@vger.kernel.org, linux-s390@vger.kernel.org,
Thomas Huth <thuth@linux.vnet.ibm.com>,
Cornelia Huck <cornelia.huck@de.ibm.com>
Subject: [PULL 3/9] KVM: s390: Fix access to CR6 in TPI handler
Date: Thu, 28 Nov 2013 15:06:52 +0100 [thread overview]
Message-ID: <1385647618-15541-4-git-send-email-cornelia.huck@de.ibm.com> (raw)
In-Reply-To: <1385647618-15541-1-git-send-email-cornelia.huck@de.ibm.com>
From: Thomas Huth <thuth@linux.vnet.ibm.com>
The TPI handler currently uses vcpu->run->s.regs.crs[6] to get the current
value of CR6. I think this is wrong, because vcpu->run->s.regs.crs is
only updated when kvm_arch_vcpu_ioctl_run() drops back to userspace.
So let's change the TPI handler to use vcpu->arch.sie_block->gcr[6] instead.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
arch/s390/kvm/priv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 2440602..b18fe52 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -197,7 +197,7 @@ static int handle_tpi(struct kvm_vcpu *vcpu)
if (addr & 3)
return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
cc = 0;
- inti = kvm_s390_get_io_int(vcpu->kvm, vcpu->run->s.regs.crs[6], 0);
+ inti = kvm_s390_get_io_int(vcpu->kvm, vcpu->arch.sie_block->gcr[6], 0);
if (!inti)
goto no_interrupt;
cc = 1;
--
1.7.9.5
next prev parent reply other threads:[~2013-11-28 14:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-28 14:06 [PULL 0/9] KVM: s390: some patches for kvm-next Cornelia Huck
2013-11-28 14:06 ` [PULL 1/9] KVM: s390: Removed SIE_INTERCEPT_UCONTROL Cornelia Huck
2013-11-28 14:06 ` [PULL 2/9] KVM: s390: Removed VIRTIODESCSPACE Cornelia Huck
2013-11-28 14:06 ` Cornelia Huck [this message]
2013-11-28 14:06 ` [PULL 4/9] KVM: s390: Do not set CC3 for EQBS and SQBS Cornelia Huck
2013-11-28 14:06 ` [PULL 5/9] KVM: s390: Always store status during SIGP STOP_AND_STORE_STATUS Cornelia Huck
2013-11-28 14:06 ` [PULL 6/9] KVM: s390: Fix clock comparator field for STORE STATUS Cornelia Huck
2013-11-28 14:06 ` [PULL 7/9] KVM: s390: fix diagnose code extraction Cornelia Huck
2013-11-28 14:06 ` [PULL 8/9] KVM: s390: Add SIGP store-status-at-address order Cornelia Huck
2013-11-28 14:06 ` [PULL 9/9] KVM: s390: Removed kvm_s390_inject_sigp_stop() Cornelia Huck
2013-11-28 14:31 ` [PULL 0/9] KVM: s390: some patches for kvm-next Paolo Bonzini
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=1385647618-15541-4-git-send-email-cornelia.huck@de.ibm.com \
--to=cornelia.huck@de.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=thuth@linux.vnet.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