From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyotn-0007uR-Ly for qemu-devel@nongnu.org; Mon, 15 Jul 2013 15:57:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uyotl-0006G9-9i for qemu-devel@nongnu.org; Mon, 15 Jul 2013 15:57:31 -0400 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:43554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyotl-0006Ft-06 for qemu-devel@nongnu.org; Mon, 15 Jul 2013 15:57:29 -0400 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Jul 2013 20:52:05 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 2924D17D8059 for ; Mon, 15 Jul 2013 20:59:03 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4076.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6FJvFRa53215274 for ; Mon, 15 Jul 2013 19:57:15 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r6FJvPtg013353 for ; Mon, 15 Jul 2013 13:57:25 -0600 From: Christian Borntraeger Date: Mon, 15 Jul 2013 21:57:45 +0200 Message-Id: <1373918265-20172-8-git-send-email-borntraeger@de.ibm.com> In-Reply-To: <1373918265-20172-1-git-send-email-borntraeger@de.ibm.com> References: <1373918265-20172-1-git-send-email-borntraeger@de.ibm.com> Subject: [Qemu-devel] [PATCH 7/7] s390x/kvm: Remove redundant return code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: Cornelia Huck , CHristian Borntraeger , Thomas Huth , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-devel From: Thomas Huth Removed the redundant return code statement from handle_instruction() - it always returned 0 and never reports any errors to its caller, since errors from the sub-functions are already reported via program exceptions instead. Signed-off-by: Thomas Huth Signed-off-by: CHristian Borntraeger --- target-s390x/kvm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 1b123cf..3dfd19c 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -697,7 +697,7 @@ out: return 0; } -static int handle_instruction(S390CPU *cpu, struct kvm_run *run) +static void handle_instruction(S390CPU *cpu, struct kvm_run *run) { unsigned int ipa0 = (run->s390_sieic.ipa & 0xff00); uint8_t ipa1 = run->s390_sieic.ipa & 0x00ff; @@ -722,7 +722,6 @@ static int handle_instruction(S390CPU *cpu, struct kvm_run *run) if (r < 0) { enter_pgmcheck(cpu, 0x0001); } - return 0; } static bool is_special_wait_psw(CPUState *cs) @@ -742,7 +741,7 @@ static int handle_intercept(S390CPU *cpu) (long)cs->kvm_run->psw_addr); switch (icpt_code) { case ICPT_INSTRUCTION: - r = handle_instruction(cpu, run); + handle_instruction(cpu, run); break; case ICPT_WAITPSW: /* disabled wait, since enabled wait is handled in kernel */ -- 1.8.1.4