[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [Patch/RFC 08/16] s390x/virtio-hcall: Specification excepti
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [Patch/RFC 08/16] s390x/virtio-hcall: Specification exception for illegal subcodes |
Date: |
Fri, 7 Feb 2014 18:16:17 +0100 |
From: Thomas Huth <address@hidden>
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 <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
hw/s390x/s390-virtio-hcall.c | 3 ++-
target-s390x/kvm.c | 9 +++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/s390x/s390-virtio-hcall.c b/hw/s390x/s390-virtio-hcall.c
index 0e328d8..c7bdc20 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;
}
}
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 3bcaaa3..0335d51 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)
--
1.8.4.2
- [Qemu-devel] [Patch/RFC 03/16] s390x/async_pf: Check for apf extension and enable pfault, (continued)
- [Qemu-devel] [Patch/RFC 03/16] s390x/async_pf: Check for apf extension and enable pfault, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 07/16] s390x/virtio-hcall: Add range check for hypervisor call, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 11/16] s390x/sclp: Add missing checks to SCLP handler, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 15/16] s390x/event-facility: add support for live migration, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 16/16] s390x/event-facility: exploit realize/unrealize, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 14/16] s390x/event-facility: code restructure, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 10/16] s390x/sclp: Fixed the size of sccb and code parameter, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 13/16] s390x/event-facility: some renaming, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 06/16] s390x/kvm: Add missing SIGP CPU RESET order, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 12/16] s390x/sclp: Fixed setting of condition code register, Christian Borntraeger, 2014/02/07
- [Qemu-devel] [Patch/RFC 08/16] s390x/virtio-hcall: Specification exception for illegal subcodes,
Christian Borntraeger <=
- [Qemu-devel] [Patch/RFC 01/16] update linux headers to kvm/next, Christian Borntraeger, 2014/02/07