From patchwork Mon May 17 18:14:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 440209 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1350175jac; Mon, 17 May 2021 11:49:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9b9ZZTMtlJya13NhjDYmEq1QQH4kEszlTQ0Yt0fNStBJzseKRfvjy4DaCvQ9l8QRqP3K6 X-Received: by 2002:a02:cc8d:: with SMTP id s13mr1386710jap.17.1621277362344; Mon, 17 May 2021 11:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621277362; cv=none; d=google.com; s=arc-20160816; b=jn3aFlicMn1l2NvxHjD/D4DAtWFfmN17Uq/rQ4OHY2D2ME4PlnWxqorfI5gvQ2iuAi y02FkiDCNcmox+ShRDb9XzAPdc6I6wXuUZRZ586btsVowrbbfyCUhm1UZn8yMsHc4DLK +HaL78rEoKQ74XOe9UqC1qnFbZx/DgtmAterxvq6PJ9cJWqpAgomwlMxNr/Dz4K4zbqf /Ajq320AfwjhIsTzCGAAomIjuBtGEavA+u06NvQtiMvueMkUVVe/OZLp8wbP2P7aDTJS F4DrkqeRS2wsAxVBQvh6da9KAP+grAn2a+eyOba1EjT4b+aaeJL5/kTEJ6MyfAGqYNZL tsVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=7SMseEfn+o74hdSlaIWSGim3Y0pchzh7J+VhjHNztRg=; b=N/HmSXVCejjWXS5vEl1EGvxNYmrfFNgeyeMeJ3VKd6GzIT8l5M1SHZbaQW3432vBLi paSUCnSehQ9Z7SxSZ2WrOSES88Gn84q5cCDHT03LkDfTxGnh+f4SsTHEZgdGC2B+XIFR cXv9q5mqHnrHK7Q7LcPiHSd4Vwr/2Pc56RXzJ8TtI71vL3oTdRBD2uWOIIhVQzAzuwn1 u+Edm15Q1aRsnEsm5w4dis3qpJo+/Kdkf8tIo+Lk1vmwb8oGfzgWEGrZK3D+gSYnYNBX drFzoEeCKmImCaY/pvo1PvPw71kiVSIaamAUseomltjavw5EutpOLsLxtUD1TFAzkzCl o9QQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t10si11680411ilf.139.2021.05.17.11.49.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 May 2021 11:49:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:33032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liiIp-00026x-Tm for patch@linaro.org; Mon, 17 May 2021 14:49:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihle-0006cP-1I for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:02 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:36869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlQ-0004UK-L2 for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:01 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mf0yy-1lFPLy2Cte-00gUtY; Mon, 17 May 2021 20:14:44 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 36/59] linux-user/s390x: Remove restore_sigregs return value Date: Mon, 17 May 2021 20:14:01 +0200 Message-Id: <20210517181424.8093-37-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517181424.8093-1-laurent@vivier.eu> References: <20210517181424.8093-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Jw3nzBlTDGO0u9kq2S9BtNByXZ/Ce2uG7M1VMYq1OYhykjeU3Cn H5QKqSuckVOMGm0kfXmJCW9ibRfcBxaPCQ9MSfjJd4qFwa02Z5jJmGTkdiQSbR3td92sT73 ihzJxIF12J5QcizDPOei4/jKNUtmrmxg/Nq8Rg2y8oCgVOjLItR7vZzZ3/ow8+QmGEdVVMy Ynuu50SLbZKZKqoVOm6Dg== X-UI-Out-Filterresults: notjunk:1; V03:K0:ZiU8Zokkm4s=:imDqsFdNdOX4i2aDrDyKTA rQENNzOXgAWD2OK24UhOAoAjASE/z71i00Oi9xJBihl0CMdJX3uhL6qh3wK3CLH6VEpcIBUAR VCTWTkSOXOshGztZ0KFuqiAIXiPMu9Fj9JqjXDT64fD6lMZONZh6edUmjytweAeNWV3gw5ZOa chrz3SebvM7clnIY/WbWPaJJedyTMLq8bFZ27Sc8fzpHmHMlFBPIj+Iqqo0KJ4sSqJqadpXAJ yZUSoO4YJae8KHLOlH2Jk8pXdpNjNjVsn7GxKSGbk5YYbxOJTTvVXuDUOvjV6WqVN/FTKNPx6 Wz/INlr1VjenRRUmBmNmq7Ruck2cBUM4+xKNqEyOXPNnDo9HYKKSjyyU8CtRIwpephNcyomMi s+qSbm5GPCUxP/eGSv8+yjuQ4u1QlWAjVW05un5PGJnYoe958UqpH5A/dAZ1MDPfQ9IFlrI2d 7T4SrTYhp7TmdaIPin4stz8szdR/PUYw2D3ulWuvadJXRXiK+ezouMt2mDJlggkSl6v9AmHMl Zv+FHxhMpBv8O2/+A6b6UY= Received-SPF: none client-ip=212.227.17.13; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Laurent Vivier , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The function cannot fail. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20210428193408.233706-5-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/s390x/signal.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) -- 2.31.1 diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index 1dfca71fa9b2..e455a9818dea 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -230,10 +230,8 @@ give_sigsegv: force_sigsegv(sig); } -static int -restore_sigregs(CPUS390XState *env, target_sigregs *sc) +static void restore_sigregs(CPUS390XState *env, target_sigregs *sc) { - int err = 0; int i; for (i = 0; i < 16; i++) { @@ -251,8 +249,6 @@ restore_sigregs(CPUS390XState *env, target_sigregs *sc) for (i = 0; i < 16; i++) { __get_user(*get_freg(env, i), &sc->fpregs.fprs[i]); } - - return err; } long do_sigreturn(CPUS390XState *env) @@ -271,9 +267,7 @@ long do_sigreturn(CPUS390XState *env) target_to_host_sigset_internal(&set, &target_set); set_sigmask(&set); /* ~_BLOCKABLE? */ - if (restore_sigregs(env, &frame->sregs)) { - goto badframe; - } + restore_sigregs(env, &frame->sregs); unlock_user_struct(frame, frame_addr, 0); return -TARGET_QEMU_ESIGRETURN; @@ -297,9 +291,7 @@ long do_rt_sigreturn(CPUS390XState *env) set_sigmask(&set); /* ~_BLOCKABLE? */ - if (restore_sigregs(env, &frame->uc.tuc_mcontext)) { - goto badframe; - } + restore_sigregs(env, &frame->uc.tuc_mcontext); target_restore_altstack(&frame->uc.tuc_stack, env);