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 /target-s390x | |
| parent | f2c55d1735175ab37ab9f69854460087112d2756 (diff) | |
| download | qemu-77319f22635e3f0ef86730503b4d18dd9a833529.tar.gz | |
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 'target-s390x')
| -rw-r--r-- | target-s390x/kvm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index b93fe84121..2fa374acc2 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -559,11 +559,16 @@ static int handle_priv(S390CPU *cpu, struct kvm_run *run, static int handle_hypercall(S390CPU *cpu, struct kvm_run *run) { CPUS390XState *env = &cpu->env; + int ret; cpu_synchronize_state(CPU(cpu)); - env->regs[2] = s390_virtio_hypercall(env); + ret = s390_virtio_hypercall(env); + if (ret == -EINVAL) { + enter_pgmcheck(cpu, PGM_SPECIFICATION); + return 0; + } - return 0; + return ret; } static void kvm_handle_diag_308(S390CPU *cpu, struct kvm_run *run) |