From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJJmZ-0002Up-OC for qemu-devel@nongnu.org; Fri, 28 Feb 2014 04:31:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJJmQ-0004ki-Nq for qemu-devel@nongnu.org; Fri, 28 Feb 2014 04:31:03 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:34236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJJmQ-0004kX-EE for qemu-devel@nongnu.org; Fri, 28 Feb 2014 04:30:54 -0500 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 28 Feb 2014 09:30:53 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 4A29A17D8063 for ; Fri, 28 Feb 2014 09:31:25 +0000 (GMT) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1S9Ud0r57868434 for ; Fri, 28 Feb 2014 09:30:39 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s1S9Uof5032279 for ; Fri, 28 Feb 2014 02:30:50 -0700 From: Christian Borntraeger Date: Fri, 28 Feb 2014 10:30:50 +0100 Message-Id: <1393579866-43465-7-git-send-email-borntraeger@de.ibm.com> In-Reply-To: <1393579866-43465-1-git-send-email-borntraeger@de.ibm.com> References: <1393579866-43465-1-git-send-email-borntraeger@de.ibm.com> Subject: [Qemu-devel] [PULL 06/22] s390x/virtio-hcall: Specification exception for illegal subcodes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Anthony Liguori , Peter Maydell Cc: Thomas Huth , Alexander Graf , Christian Borntraeger , Jens Freimann , Cornelia Huck , Richard Henderson From: Thomas Huth 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 Reviewed-by: Cornelia Huck Signed-off-by: Christian Borntraeger --- 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 b93fe84..2fa374a 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