ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Huth 2014-01-14 13:32:23 +01:00 committed by Christian Borntraeger
parent f2c55d1735
commit 77319f2263
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/s390x/s390-virtio-hcall.c
View File

@ -31,7 +31,8 @@ int s390_virtio_hypercall(CPUS390XState *env)
if (env->regs[1] < MAX_DIAG_SUBCODES) { if (env->regs[1] < MAX_DIAG_SUBCODES) {
fn = s390_diag500_table[env->regs[1]]; fn = s390_diag500_table[env->regs[1]];
if (fn) { if (fn) {
return fn(&env->regs[2]); env->regs[2] = fn(&env->regs[2]);
return 0;
} }
} }

9
target-s390x/kvm.c
View File

@ -559,11 +559,16 @@ static int handle_priv(S390CPU *cpu, struct kvm_run *run,
static int handle_hypercall(S390CPU *cpu, struct kvm_run *run) static int handle_hypercall(S390CPU *cpu, struct kvm_run *run)
{ {
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
int ret;
cpu_synchronize_state(CPU(cpu)); 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) static void kvm_handle_diag_308(S390CPU *cpu, struct kvm_run *run)