diff options
author | Thomas Huth <thuth@linux.vnet.ibm.com> | 2014-01-14 13:32:23 +0100 |
---|---|---|
committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2014-02-27 09:51:25 +0100 |
commit | 77319f22635e3f0ef86730503b4d18dd9a833529 (patch) | |
tree | 22f802500e646ea2466771544001845ffec33351 /hw/s390x | |
parent | f2c55d1735175ab37ab9f69854460087112d2756 (diff) | |
download | qemu-77319f22635e3f0ef86730503b4d18dd9a833529.tar.gz qemu-77319f22635e3f0ef86730503b4d18dd9a833529.tar.bz2 qemu-77319f22635e3f0ef86730503b4d18dd9a833529.zip |
s390x/virtio-hcall: Specification exception for illegal subcodes
So far, the DIAG 500 hypervisor call was only setting -EINVAL in
R2 when a guest tried to call this function with an illegal subcode.
This patch now changes the behavior so that a specification exception
is thrown instead, since this is the common behavior of other DIAG
functions (and other CPU instructions) when being called with illegal
parameters.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'hw/s390x')
-rw-r--r-- | hw/s390x/s390-virtio-hcall.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-hcall.c b/hw/s390x/s390-virtio-hcall.c index 0e328d806d..c7bdc2005d 100644 --- a/hw/s390x/s390-virtio-hcall.c +++ b/hw/s390x/s390-virtio-hcall.c @@ -31,7 +31,8 @@ int s390_virtio_hypercall(CPUS390XState *env) if (env->regs[1] < MAX_DIAG_SUBCODES) { fn = s390_diag500_table[env->regs[1]]; if (fn) { - return fn(&env->regs[2]); + env->regs[2] = fn(&env->regs[2]); + return 0; } } |