summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm
diff options
context:
space:
mode:
authorHeiko Carstens2014-01-01 16:52:47 +0100
committerChristian Borntraeger2014-04-22 13:24:43 +0200
commitf748f4a7ec549febb76e86082d9445beff1e9b01 (patch)
tree6bf3de28d2a3c1a33fa4e555c39c1183f701c330 /arch/s390/kvm
parentKVM: s390: convert handle_set_clock() (diff)
downloadkernel-qcow2-linux-f748f4a7ec549febb76e86082d9445beff1e9b01.tar.gz
kernel-qcow2-linux-f748f4a7ec549febb76e86082d9445beff1e9b01.tar.xz
kernel-qcow2-linux-f748f4a7ec549febb76e86082d9445beff1e9b01.zip
KVM: s390: convert handle_store_prefix()
Convert handle_store_prefix() to new guest access functions. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r--arch/s390/kvm/priv.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 9648504d7818..306caa27b962 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -106,6 +106,7 @@ static int handle_store_prefix(struct kvm_vcpu *vcpu)
{
u64 operand2;
u32 address;
+ int rc;
vcpu->stat.instruction_stpx++;
@@ -122,8 +123,9 @@ static int handle_store_prefix(struct kvm_vcpu *vcpu)
address = address & 0x7fffe000u;
/* get the value */
- if (put_guest(vcpu, address, (u32 __user *)operand2))
- return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
+ rc = write_guest(vcpu, operand2, &address, sizeof(address));
+ if (rc)
+ return kvm_s390_inject_prog_cond(vcpu, rc);
VCPU_EVENT(vcpu, 5, "storing prefix to %x", address);
trace_kvm_s390_handle_prefix(vcpu, 0, address);