From patchwork Mon May 4 15:59:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 283460 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13ADAC3A5A9 for ; Mon, 4 May 2020 16:07:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC7B6206A4 for ; Mon, 4 May 2020 16:07:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC7B6206A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVddI-0005z6-UH for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 12:07:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdVx-0001Nc-Hk; Mon, 04 May 2020 12:00:17 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:54491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVdVu-0005mC-KA; Mon, 04 May 2020 12:00:17 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MYvoW-1ja3O40YzY-00UpXT; Mon, 04 May 2020 18:00:00 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 02/19] display/blizzard: use extract16() for fix clang analyzer warning in blizzard_draw_line16_32() Date: Mon, 4 May 2020 17:59:39 +0200 Message-Id: <20200504155956.380695-3-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:C4Bu8a/krPIoq9y/FOF4tSxvMpaOkr1nID8+jsE3cCLyOe7/GfS 8bL9BvXbqA2/YdCniElhEUEYlZgvpyMOEhgGwusD1bal7OQZJGSJODms3PdsI/6BPwTqA3V mUzA+E1a98aiSWFEQipW7cHrC4r1eb3+jobVQXXBJp82sGfIKwZskg/KJHXNO/HDkYp76J6 IilYDiBWUs9eH4Hgpu0YA== X-UI-Out-Filterresults: notjunk:1; V03:K0:06UROSzpzgI=:MtR1W0RDxQy0GEUzp10D4X 09yGpidYwYTnMWOJdKpUtC3Dq8RVwxIVGovF/0MZPVOSjx9jeI3ZmxoQitEkFCswY9hbOnhQL ThGrzqJxC/avlGSOHF+b8JobZ9fBkuoLymeWEgNCupG8ofT/xP/pH5YFVM3IMH2rRFmueNYft kAlOH9B5c3GaSRE3DSIVsKbUg2qEiLrFTxnXNRm3XLWzuORENoUwMeBit5+OqBHGrPAYm4Y6D +e1Vjby/RLp0bV/zV2+GOTgHwvxLBwhHL1KXeaDHtWfE5jgvvAwrfbMlYcA+HB7XK/5b1wksY 2ZTGp2YdZNJf396oxZ8zHkpMT6b9+gz/W4B7jXcBjHdA7TfK4gTxfC3PJtueZOch/pptOg8nA aAg7EfQMkmZccktkG9DcaOocpHmPz8CiUC3jmKIS7yBl+K/s2yzX7xi+PLrvxD9oOnynKhxnL 3EGE2NaD8YYlNILaGr6vNlpgdvi7RlheoLq9xZDTnlR1LOyxC/oJqEz1N+BnOVGxCXcX2kNci SqBDJOvnOZbUAMUA0r/XtPbmMgn4B/JYR9c3mB3rnlhMIdj+DAMiYfFIDtV7KU6K09s0+Nhw/ wW/KRf5dHLMmhzYQBmpVEbybuxfra5mkBl8wu17dgMdqntn6t7iN4oiOpDBMkfSfKPzhVLXDP GtDpS8QJtOXb6LeNyuGta+5lMkJTDQA/cOO/wgjBxTyZ9K82mpKJrQXNgKhzA2TPHEvpDP3S6 9BM5mT5P8MiW4EPlio4DbNgTqwmKHkz1Dcg0mcsqc+uoSPWazEMldjWczp87n12yXe8pEl7f1 bt9CFzIsvqA3v1gp9ziRs0SqJIUXSRxVisnChq433u4wPe6npo3YZOKRECWYOgp5UlAzTJ7 Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 11:59:59 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: qemu-trivial@nongnu.org, Chen Qun , Michael Tokarev , Laurent Vivier , Euler Robot Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Chen Qun Clang static code analyzer show warning: hw/display/blizzard.c:940:9: warning: Value stored to 'data' is never read data >>= 5; ^ ~ Reported-by: Euler Robot Signed-off-by: Chen Qun Reviewed-by: Laurent Vivier Message-Id: <20200325025919.21316-3-kuhn.chenqun@huawei.com> Signed-off-by: Laurent Vivier --- hw/display/blizzard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index 359e399c2a0b..105241577de1 100644 --- a/hw/display/blizzard.c +++ b/hw/display/blizzard.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/bitops.h" #include "ui/console.h" #include "hw/display/blizzard.h" #include "ui/pixel_ops.h" @@ -932,12 +933,9 @@ static void blizzard_draw_line16_32(uint32_t *dest, const uint16_t *end = (const void *) src + width; while (src < end) { data = *src ++; - b = (data & 0x1f) << 3; - data >>= 5; - g = (data & 0x3f) << 2; - data >>= 6; - r = (data & 0x1f) << 3; - data >>= 5; + b = extract16(data, 0, 5) << 3; + g = extract16(data, 5, 6) << 2; + r = extract16(data, 11, 5) << 3; *dest++ = rgb_to_pixel32(r, g, b); } } From patchwork Mon May 4 15:59:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 283461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D74D1C3A5A9 for ; Mon, 4 May 2020 16:07:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8DA3206A4 for ; Mon, 4 May 2020 16:07:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A8DA3206A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdcl-0004wx-Ly for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 12:07:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdVq-0001Dj-1i; Mon, 04 May 2020 12:00:10 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:54233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVdVp-0005kG-3H; Mon, 04 May 2020 12:00:09 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mr8vG-1ikyR83KUw-00oHIX; Mon, 04 May 2020 18:00:05 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 05/19] hw/mem/pc-dimm: Print slot number on error at pc_dimm_pre_plug() Date: Mon, 4 May 2020 17:59:42 +0200 Message-Id: <20200504155956.380695-6-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ENPdAA29+zp3lVMUvxu80YJ8Ojw2ObQTjp6eS5nqnTAZiXMr8PL 8017I3ybDAr5rqXD5VSiGdieseTxwSupG/lzj8zYKp+E7PJvAv8Fgmgflh2zyk4SHU4j3S9 S4Ik8Ht5w+83x3jpxBb8B5FW1K6oZWU+vklaw+GjbLnIRct7mBjLKn5rIKV8DGlnZopxqgs e0hPsIsce0IcKH0kEAKOA== X-UI-Out-Filterresults: notjunk:1; V03:K0:LwBAzQSgGuw=:PIHfKXJj341vsl2wfh5GMs 6IAoBvMhHUO1IQ6RWnj3hvFCtOsqSzgiBVrxww70CyRQy5auFBwsDcN5tbGpVk+Aow41ouRsz fgzv0uLDDWILlpv/p1iIF4dDKCXCN4E+wPhTAI3XfWJ+9h8aE+pV1retfSVQSLR6zVf0pElIt XhbBhWfxKt6yK4E3zesBpjfW9IqzTPx38WoPJw6ARvqcWtWSGJZclnRAjU33RQ6KioWbxoYQ4 HbQRwODYBc/6+jcM+iJLPkwZcpiIVhv/rok28+W1eiTuziZ50aH7DWHNP9cvQlP1qbSq1E/jx 1WrmAPOGRTLHG1+DntFwFfAiW/7eTQBUbMYAwuA616/xUgEQhSSq8XIklVBA08i1b0XrKHfZ6 Vpnv2QZ6GOVIGV8Jn/8uR8rScyj5ll4LylCPPWwZWjGiFE/XAXSeHRYZ6LO70ax5TI8gUwvAr uyA3EzlOIUH3+VQ2K+hyuyeWeMXoSNvUkALLZeHDnlZVVwLXip9znCBsp62bvoBf8V+UQAEhI pk4Cd8DhR7tHVcMN5Q/S+didc/nVdQqL8sKQdtzVWd0vQWW6N3Zu/vrEamcF7+HJ+P9GsnoA3 sVhk3Q6n+mk1tnuRnRJtpBl95xWofT4G+M9u/mKiV/3WTZKkOTR4J8nT8JbTKZavyEzmYAv3b VewdN5AhwHDPM96fYxT7k9Lccngf7p1PLfUCYG9FNOPSNv6wHZrXmSVz58qljNw9EWFkbBV2A 7XAGr7UbDbGpOsvolemahh6mf+O/eFjh5OCDMytYz6mK1VHjgvBjIxa3o90dPgpVtGZ7aC3iw awbS0y4vNMNXJUBZpD3mRzH5nAkxgULltVF+nCBF0kXY4KBIyDkmyJSYzYchguByLqxskkD Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 12:00:07 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Wainer dos Santos Moschetta The error report in pc_dimm_pre_plug() now has the slot number printed. Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20200310180510.19489-2-wainersm@redhat.com> Signed-off-by: Laurent Vivier --- hw/mem/pc-dimm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 8f50b8afea3c..36edfcf46799 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -44,8 +44,8 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, &error_abort); if ((slot < 0 || slot >= machine->ram_slots) && slot != PC_DIMM_UNASSIGNED_SLOT) { - error_setg(&local_err, "invalid slot number, valid range is [0-%" - PRIu64 "]", machine->ram_slots - 1); + error_setg(&local_err, "invalid slot number %d, valid range is [0-%" + PRIu64 "]", slot, machine->ram_slots - 1); goto out; } From patchwork Mon May 4 15:59:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 283463 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D0ADC3A5A9 for ; Mon, 4 May 2020 16:03:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D8E220721 for ; Mon, 4 May 2020 16:03:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D8E220721 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdYp-0004oI-Ck for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 12:03:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdVr-0001F1-3I; Mon, 04 May 2020 12:00:11 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdVq-0005kK-3B; Mon, 04 May 2020 12:00:10 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MofPt-1ilnFk1Wwr-00p6Ni; Mon, 04 May 2020 18:00:05 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 06/19] hw/mem/pc-dimm: Fix line over 80 characters warning Date: Mon, 4 May 2020 17:59:43 +0200 Message-Id: <20200504155956.380695-7-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:em8Ro7Bxb76UX+NhBZVrhfAo2IY158fF8IAqTyytP9VC0EvtNvj VnN3b3aL++yj4gdmMyTg9Mn5sUN+Ve+Zqh51S5Ux6UUME1Es4TkFuAFj4yo/4RrlT4OPAZw us95WJ7qwU+ipeYIVpJLwiS5gA0SIAKt6sHaBS3xFws2vxn/Ezb1D5sZg4qm3OjTxVSVEHt qsrF1QLItJdFcJ7dHtnXg== X-UI-Out-Filterresults: notjunk:1; V03:K0:EsG4avR42vE=:8iY838rOaAJiXcAfwcAo6O wUGkOvzha7fDgU7ARzJeN6er9b/9p14U1PxuXhTpHeFntFsF9KCOqAKLgWM7difDayPoRD19T NT/SJREm7vSaT8UmNuTPMMDHvoiOoTkJvcou6av2/fKxA3cdwlGeD04Tqlftwa0EkDVUbprLh z+EJNF2DQUxm4jacL52bos0/YwRRB9EZI8AI5pj8Lr43+GqzCiIf9wjXmH6c8nvra5qpvUeY1 jgoXe1iTZ9K1B1CtTh1GZL0gpYm5i2F04BK9JuHkAN9Tc+mQ+1/+52jIeTvEM8Ee0YKfwM42Q 4K6JM8EbYQ9JMYxCHNg+wUS29MvgTkxFVYMbBhh/vnzWhaIlDiatWM8ek5oWBT5pFvcMA1pcS 8a58vo2FYmKuSnW/3QpVT3tEqNQySqUZHpSQKq02tpiFkVZyipqteZMHKRuCo5q3RcSPF264/ r6XedbzwX0olTai/e8LIco5B1Qtdtuf1evv5ozGDNjObgnFm4+ART4Owujhr7BK0WlM6Cb2Ov qwCDsyE110jA7XlHPmhipoQ5vCPjzhFK7fqSGi4RXOz7ffG5KlL1BhWr9bFwdeV9yUwn7mOKf U6VMicYQt1Pk0R2pr4KEkCSAkOcloW+rxL9lYnNGWE/NeHNl0PYkp7+yJXeC4Cu0eBzaBxm2D PSF/A7oz1WPcRGrokPG0dKnggHX0xvn6J45XlsPFaLplT2abQp5wjgglE6brJVid1e9NFDO7w zWJA3dmJZPS25d6fc7mM9l/Fqnt2tN1/d+5PYCZKVzK0duycezkdTkxeDYTk+BKKhYLfobfZr DPsu1C5L8qJn6xnKddBlqoe07iPcmk6hNN/qXxYoNHa9nK+Pq/oa4qVQSCXcKMq/XwmWK6o Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 12:00:08 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Wainer dos Santos Moschetta Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20200310180510.19489-3-wainersm@redhat.com> Signed-off-by: Laurent Vivier --- hw/mem/pc-dimm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 36edfcf46799..6d62588fea8c 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -218,7 +218,8 @@ static MemoryRegion *pc_dimm_get_memory_region(PCDIMMDevice *dimm, Error **errp) static uint64_t pc_dimm_md_get_addr(const MemoryDeviceState *md) { - return object_property_get_uint(OBJECT(md), PC_DIMM_ADDR_PROP, &error_abort); + return object_property_get_uint(OBJECT(md), PC_DIMM_ADDR_PROP, + &error_abort); } static void pc_dimm_md_set_addr(MemoryDeviceState *md, uint64_t addr, From patchwork Mon May 4 15:59:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 186159 Delivered-To: patch@linaro.org Received: by 2002:a92:8d81:0:0:0:0:0 with SMTP id w1csp255423ill; Mon, 4 May 2020 09:09:06 -0700 (PDT) X-Google-Smtp-Source: APiQypJmEgrVefEKkMGwpkXoctAmV25uZWgrEQ9IsjyXQAhw1H+Nluet24LEdlKEEl1PrhTthtIY X-Received: by 2002:a05:620a:1108:: with SMTP id o8mr7410023qkk.150.1588608546048; Mon, 04 May 2020 09:09:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588608546; cv=none; d=google.com; s=arc-20160816; b=mavypSCRp8KL11e8nc2gtalZShqPEckJW7AMf37zOxxlu5g1JNSo1Gf9l7RXi7eFUT s6U/HLQpvIwC3flIJ8EICFJ8PSEL/UDj+wy3Gkq/VAx4p6F9GFRzAxNOXPaAXvsyci/S X6uLh6qYnDk5Gjmw9CekR7FfV55dDYEQ7lfaIo+Py4PhybsW4jsdZrKyDxyvCxF1j7lf Yfvh1PDjZoyCvepKXjfVEeijjCPRIhlu3sGTlasdawjGpdchCtGEfrYjOdJi98wCM6kL jkoMGGc0x3rJtyLP9kS4mfDW5WqhB2TXt08NrZwgMOqifaSRLESOaPp4d4RSlMGt6bPa IuYA== 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=i4PZBQWT1lWk1owaBXRR7ha4wIQxrw3n7urbluKvKBM=; b=TY4QbksdX8dPA4WnpDqZHjDWyR+CMPMRBV7WuEGY5zGNpa7yE8oaEyqg9j639MpliX 1m2fBQuoTDo5xjo2jZ+OiZM2SKnhGzmGve/Et+JuDZK6hHJpR56MrvXAVKVrRw0Id5Yi 713pEjcitJcGwgEEjHZaGHIGC+vwcol+lG02/+/zWgI3qyCiyuUJcsCyFteARcX8idc0 K0ZLM3mm43+x17hgIbLFtPXE1AVodGdCVed8btkovZvPWvxGztAe31jT5aXhbp2f/iCh wP2IOfGT7daHe2gzxpwoHMdQ/qBZBJdaAXdAmXAT4AAXOlAnJKad9zw3gAJTiX+maxLZ T5qQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:470:142::17]) by mx.google.com with ESMTPS id 16si3721287qks.262.2020.05.04.09.09.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 May 2020 09:09:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) client-ip=2001:470:142::17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:55896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdeT-0007jQ-Hd for patch@linaro.org; Mon, 04 May 2020 12:09:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdVy-0001PB-CE; Mon, 04 May 2020 12:00:18 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:44609) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVdVw-0005nY-5U; Mon, 04 May 2020 12:00:17 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MA7X0-1jPXum20HS-00Bccv; Mon, 04 May 2020 18:00:06 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 07/19] elf_ops: Don't try to g_mapped_file_unref(NULL) Date: Mon, 4 May 2020 17:59:44 +0200 Message-Id: <20200504155956.380695-8-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:f+vpvirZHuRjvIciBk9UcbBzY51RKB7hnElLVSfcmmYBp6mxs0J HxuKMLIMnjBJhT31m5V0SPS6c2U+ywNe1Y12Als2WuZl9cRnh5frwzmijdOwUzeUduhM6HW qnLDcKEX4p7BosWThczVeDqiBCjiCxuG3KWYCX3KT191c+B+JTCQsLc/NFrth278ORe088P mWQAqwPaLzlEvYeIfnNlA== X-UI-Out-Filterresults: notjunk:1; V03:K0:Zt1BNX0Nszg=:87pJDOrPwdPruObCNNdWMh 0FrqtSD0/+QZqvoGPyoPy/tcGcv1ErgfL5gj77iMStR3cM/q+Donm7I/RPGvszC8qwfcym6W1 O0CvlpIDAyF45xKkwFW9YWJPbbPWq57rtv4H6KpspF9IQI81Vba1FpisjCwtZYntEK+a1QalQ VTeIVA+60uE8JgTtAvf7cBtYb9Fmkm/fdYlwsF/NyxtLzlx3tqUa+I/lD7TTRA+fsyoSMnbTO xTmh6eZTcs4DSSXwPN3pf1CvhLS8JdOx4kDX6VBF9HJlJhTEWnkhJkIs9vGG9QZhDd1zU7GEK ucUVBqTMOGqmJaNDrBhyRiwtz7B0AHcyHsNqC/ISIdEP3aH8se9KKShG54LJ5y6lBVRGVX6fw ea7vDqy/cdZkm5Jy5EIIlXdRz78V/HoBGs4FtfKVUj6QjiK/+2sikKziQSU2W30pCHTUL0ONp lqpqUR8Xi4Zk36AAwGUpIdA6DbgDZu5AeGPljWWREFKU2Eju+DIxs5vDxgj35Y+mZDzBNK4Jo npKauCzU+3NgP6kI/GMCQtI2Fusn1Ehfw8zjCp/H7KS53PMUDH8jiUy+qX7FmLNtmiQq5BKjc Awx9ZTpCRRs3yclNDe2t1h6vZI3AJT14AsR2KQl9H3yZbMbVwDLvd4TLvvxngcDG4rK5UM935 by9Jk/Z0eFRZMlqJgQ4bzlAkNSXBlp4bwDI51nRIjCi7hogzAqp81FabWEYbkV+/a7g91XXR6 OxPPKTQlffT4e8MbZSMzx9fXK1I01C04tTO26oJA58eEpfkGXrM5Wt+DF4/7l2/u5TpQFnpPl OgA/iNujadxhb5F1oKzgLcckFRd6eaG+/mw8+L8Ln9WRiDgEUBllYrAM+QbSIZP7q8xLDsN Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 11:59:59 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Peter Maydell , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Randy Yates , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Calling g_mapped_file_unref() on a NULL pointer is not valid, and glib will assert if you try it. $ qemu-system-arm -M virt -display none -device loader,file=/tmp/bad.elf qemu-system-arm: -device loader,file=/tmp/bad.elf: GLib: g_mapped_file_unref: assertion 'file != NULL' failed (One way to produce an ELF file that fails like this is to copy just the first 16 bytes of a valid ELF file; this is sufficient to fool the code in load_elf_ram_sym() into thinking it's an ELF file and calling load_elf32() or load_elf64().) The failure-exit path in load_elf can be reached from various points in execution, and for some of those we haven't yet called g_mapped_file_new_from_fd(). Add a condition to the unref call so we only call it if we successfully created the GMappedFile to start with. This will fix the assertion; for the specific case of the generic loader it will then fall back from "guess this is an ELF file" to "maybe it's a uImage or a hex file" and eventually to "just load as a raw data file". Reported-by: Randy Yates Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefano Garzarella Message-Id: <20200423202011.32686-1-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- include/hw/elf_ops.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.26.2 diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index e0bb47bb678d..398a4a2c85bb 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -606,7 +606,9 @@ static int glue(load_elf, SZ)(const char *name, int fd, *highaddr = (uint64_t)(elf_sword)high; ret = total_size; fail: - g_mapped_file_unref(mapped_file); + if (mapped_file) { + g_mapped_file_unref(mapped_file); + } g_free(phdr); return ret; } From patchwork Mon May 4 15:59:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 283464 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAE3FC3A5A9 for ; Mon, 4 May 2020 16:02:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9FA22206D9 for ; Mon, 4 May 2020 16:02:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FA22206D9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdYO-00043M-M8 for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 12:02:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdVt-0001Ii-11; Mon, 04 May 2020 12:00:13 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:33521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVdVq-0005kd-W3; Mon, 04 May 2020 12:00:12 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MXop2-1jdLB51vEy-00Y7KN; Mon, 04 May 2020 18:00:07 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 08/19] MAINTAINERS: Update Keith Busch's email address Date: Mon, 4 May 2020 17:59:45 +0200 Message-Id: <20200504155956.380695-9-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:QMHV9+K8XV5X/uJSLqhq68a1uasN6RUvj//hYo3bwz6NDc6/nYl Y5SAi4QBFrYQAePfwOzVSbcM+ZuzW44tKRxZsF7zSIHKBCNY9JWEv54VZlURR3sNei/x3vX BADCzOewrI1TJg8o616WfjfK/vnK7gr99+Pu7BOXfiAoUL5TGsWA342tvsUEd4ArAu9+6oi VLwsQC+U6/WAVWPLQbACw== X-UI-Out-Filterresults: notjunk:1; V03:K0:mW6I6tShjs4=:6HTnuURBUNvVfv15FSIJvA r4BI57D7E6cs6eNZagoTZxz4Y7xsvXkGXB0Wej52bdSJLsF+o2Y0whG+fXGt/m5tSTqnH7GVq Blniib3QrvAa/S6bBZgUROcNbflZwmXaP/4XEYZqRV7bNiRmcivWkUeL0hVWic9rlbCSLimgs 2+igdDD4uOuUlZniFMTZSkdf2WsGMj8yhxkBCQyf+MKWJJqQ7ZhdUm99NVO6TsQF9APZR/KQ6 fOwUJIjZdMiU9NPYLfrAKyfF8we1YIqOzHMiPSJ53728N7pc2UxnSlYjPbA/i4SL8QWruJAox qoKJiVvvGHcHucQLeo7jME3DQ7xXQTAh+8WXJpb/POfJiF9deZmqnihY2rCyrdnzS/EjSjymc mRAyyujhNAU4z/J84IsTT+LZrNMD8rU2l76a9WM9lT1rIeH4EZFrUdrU9/Hga/cA8RbO9ftn8 Ahq7K6JFCfjL/hknCGH73Pmt+FrLHpNPqkCQXeKd3CKZqvgedPd1MdBvyXpdJBmZ2YAWOpBGE fZ04iJVM8lkDiqN7YfjJw9K5mQH037nU8WlrpBP1cA3n6nfn3+fypmia7rdfvZoAGis4NQ2Vi jMNtSePrMXibYxTXbap5in/OtEs4uOrssvCcD6Pu74uncxzP8lnZ/pEiZ5ULcyfvhUKyiE2uK NiwoDHQSoOIArNEFmqQ8PUydhaviPBDDREVwOJO9JaPZVHH29AeIuZkL6jHRMtDDJIreDIAAL dqA/m1q76BTl/vBJ6sQcqxnwuPLoDHHbTudg7QxSjUFODhATNqPsvleX4bAMgW+WXG4gpMtJ0 9qqBW7rEr3xh/pBeRtRQZ/RvENVtLL08otoSEtlZRCrnjyiPsIMoOghPWmY5DlRTvtA3eix Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 11:59:59 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: qemu-trivial@nongnu.org, Keith Busch , Michael Tokarev , Laurent Vivier , =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé keith.busch@intel.com address is being rejected. Replace by the email address Keith is actively using. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Keith Busch Message-Id: <20200421122236.24867-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index d6886be13159..1f84e3ae2c6a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1735,7 +1735,7 @@ F: hw/virtio/virtio-crypto-pci.c F: include/hw/virtio/virtio-crypto.h nvme -M: Keith Busch +M: Keith Busch L: qemu-block@nongnu.org S: Supported F: hw/block/nvme* From patchwork Mon May 4 15:59:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 283462 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36D1FC3A5A9 for ; Mon, 4 May 2020 16:05:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09E1F20721 for ; Mon, 4 May 2020 16:05:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09E1F20721 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdb3-0000vJ-UF for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 12:05:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdVv-0001LH-Ke; Mon, 04 May 2020 12:00:15 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:44231) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVdVt-0005lV-Uh; Mon, 04 May 2020 12:00:15 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N2Unv-1j9WfG1KZj-013rJ2; Mon, 04 May 2020 18:00:09 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 10/19] Compress lines for immediate return Date: Mon, 4 May 2020 17:59:47 +0200 Message-Id: <20200504155956.380695-11-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:P3N0uPLKPJIb/bYPaYgYpjNUyt9xBCp395PXu7WsdQuBoNJVehR 6WgBSJvxyQ37otDgds89Sws2H8XT4bwPBc/ceKs5LTuOMRB65BqAqYdT8FZX3lTrpKSnXO3 dmeS/1NO3joi1SMpq3IHgKZoXFQAcL+PhCRuMofyw/ovpCEHa9tdi5oBHUDO5ZqeluY0iKL Ge4g+zitlB+N8wsLcanwA== X-UI-Out-Filterresults: notjunk:1; V03:K0:d7zq/M5tqUs=:yU6zU9nspbu1zWVEQUNzoh HzsvuIR0ZpP7IL60AePDoyGy4r0+mMUyzP+VNTKxLxBsiy4HchpUHwA4dEUj7MjyfzFyLULLp 5g5xC/7YAIR3d5a6pFIIIo1DxKdIjFqQ+AlOdKap1vTU/qHbZzGI5Y73YUxmgVEs4G59rT5HS z9pmqXAxZRHk61bl3/WAo9rADcJE/dUKPzLyMDaonl10KLfeoGTWM0iuLJY6aifaV5Pi2xC8f sD8HrmHiwqJvKC8vRqiomKf+NUXNdqzknAkeEbEhv0XscDeKYwJSEG0t9lFxbm0Wv1FFrMxim fwsPvyfHmkpkenxQXjGbN5ybD81xGY3RJVuWouf3ZN1xIFaFEfHcbCaCZZdwwsEVs6vGrCm8t zDV5QMHnCFG7WTquEfH9SH4dOLrOjRNXxfmEX3cMM74TBsGSgnTM6oL/I2iBMNk55vlcAmyIB if7MaFYU67fUznL2n+IL/UlYrmrW9dN6KR+JTkEjiKWVqdu4N5RPrAaKW0eNAoLTDbRKxIKRM vC53GtD74y7l7NExqM7I1pOFjDhnZJH9TWvimM3tipetUHE0ofWBqeaoSZga7UomTb4h5+BKB 6j5L4ht5U91eIJhHw1m3JCGvYehvJBM0Ey6LmkGvSJECkOgJxELTgtJ4Rv/ESRFvJWxM7+R1Q Om2kiWhUI/Pjg+RIHl5/4Fym2K5UlI3svRd/ckHMBFosY/8l5adDTNlBKYVal7SWTKIy7OJtj lwsFk+yW/olasbbXt4LvhWw4HGvjjhhJo9pVvW1FYVF1hubmMo+RdADAHbMggTiqzEy9H5tdx tVH3FVIdAFX5BxrSVnOo+fnke1kT9grthJovbUs19bxYt73lE1Ncu8Y3cK4U8T9TN8t+2jz Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 11:59:59 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: qemu-trivial@nongnu.org, Simran Singhal , Michael Tokarev , Laurent Vivier , Stefan Hajnoczi Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Simran Singhal Compress two lines into a single line if immediate return statement is found. It also remove variables progress, val, data, ret and sock as they are no longer needed. Remove space between function "mixer_load" and '(' to fix the checkpatch.pl error:- ERROR: space prohibited between function name and open parenthesis '(' Done using following coccinelle script: @@ local idexpression ret; expression e; @@ -ret = +return e; -return ret; Signed-off-by: Simran Singhal Reviewed-by: Stefan Hajnoczi Message-Id: <20200401165314.GA3213@simran-Inspiron-5558> [lv: in handle_aiocb_write_zeroes_unmap() move "int ret" inside the #ifdef] Signed-off-by: Laurent Vivier --- block/file-posix.c | 8 +++----- block/nfs.c | 3 +-- block/nvme.c | 4 +--- block/vhdx.c | 3 +-- hw/audio/ac97.c | 4 +--- hw/audio/adlib.c | 5 +---- hw/display/cirrus_vga.c | 4 +--- migration/ram.c | 4 +--- ui/gtk.c | 3 +-- util/qemu-sockets.c | 5 +---- 10 files changed, 12 insertions(+), 31 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index bf09ad8bc0d0..05e094be295c 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1617,13 +1617,12 @@ static int handle_aiocb_write_zeroes_unmap(void *opaque) { RawPosixAIOData *aiocb = opaque; BDRVRawState *s G_GNUC_UNUSED = aiocb->bs->opaque; - int ret; /* First try to write zeros and unmap at the same time */ #ifdef CONFIG_FALLOCATE_PUNCH_HOLE - ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, - aiocb->aio_offset, aiocb->aio_nbytes); + int ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, + aiocb->aio_offset, aiocb->aio_nbytes); if (ret != -ENOTSUP) { return ret; } @@ -1631,8 +1630,7 @@ static int handle_aiocb_write_zeroes_unmap(void *opaque) /* If we couldn't manage to unmap while guaranteed that the area reads as * all-zero afterwards, just write zeroes without unmapping */ - ret = handle_aiocb_write_zeroes(aiocb); - return ret; + return handle_aiocb_write_zeroes(aiocb); } #ifndef HAVE_COPY_FILE_RANGE diff --git a/block/nfs.c b/block/nfs.c index 2393fbfe6bcc..18c0a7369454 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -623,8 +623,7 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags, } bs->total_sectors = ret; - ret = 0; - return ret; + return 0; } static QemuOptsList nfs_create_opts = { diff --git a/block/nvme.c b/block/nvme.c index 7b7c0cc5d673..eb2f54dd9dc9 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -575,11 +575,9 @@ static bool nvme_poll_cb(void *opaque) { EventNotifier *e = opaque; BDRVNVMeState *s = container_of(e, BDRVNVMeState, irq_notifier); - bool progress = false; trace_nvme_poll_cb(s); - progress = nvme_poll_queues(s); - return progress; + return nvme_poll_queues(s); } static int nvme_init(BlockDriverState *bs, const char *device, int namespace, diff --git a/block/vhdx.c b/block/vhdx.c index 45be0a43218c..aedd78260455 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -411,8 +411,7 @@ int vhdx_update_headers(BlockDriverState *bs, BDRVVHDXState *s, if (ret < 0) { return ret; } - ret = vhdx_update_header(bs, s, generate_data_write_guid, log_guid); - return ret; + return vhdx_update_header(bs, s, generate_data_write_guid, log_guid); } /* opens the specified header block from the VHDX file header section */ diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 1ec87feec0cb..8a9b9924c495 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -573,11 +573,9 @@ static uint32_t nam_readb (void *opaque, uint32_t addr) static uint32_t nam_readw (void *opaque, uint32_t addr) { AC97LinkState *s = opaque; - uint32_t val = ~0U; uint32_t index = addr; s->cas = 0; - val = mixer_load (s, index); - return val; + return mixer_load(s, index); } static uint32_t nam_readl (void *opaque, uint32_t addr) diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index d6c1fb0586c6..7c3b67dcfb8c 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -120,13 +120,10 @@ static void adlib_write(void *opaque, uint32_t nport, uint32_t val) static uint32_t adlib_read(void *opaque, uint32_t nport) { AdlibState *s = opaque; - uint8_t data; int a = nport & 3; adlib_kill_timers (s); - data = OPLRead (s->opl, a); - - return data; + return OPLRead (s->opl, a); } static void timer_handler (void *opaque, int c, double interval_Sec) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 0d391e1300aa..1f29731ffe11 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2411,12 +2411,10 @@ static uint64_t cirrus_linear_bitblt_read(void *opaque, unsigned size) { CirrusVGAState *s = opaque; - uint32_t ret; /* XXX handle bitblt */ (void)s; - ret = 0xff; - return ret; + return 0xff; } static void cirrus_linear_bitblt_write(void *opaque, diff --git a/migration/ram.c b/migration/ram.c index 04f13feb2e77..06cba8863280 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2135,9 +2135,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) } trace_ram_postcopy_send_discard_bitmap(); - ret = postcopy_each_ram_send_discard(ms); - - return ret; + return postcopy_each_ram_send_discard(ms); } /** diff --git a/ui/gtk.c b/ui/gtk.c index 030b251c6109..83f2f5d49b2a 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1650,8 +1650,7 @@ static GSList *gd_vc_menu_init(GtkDisplayState *s, VirtualConsole *vc, G_CALLBACK(gd_menu_switch_vc), s); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), vc->menu_item); - group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(vc->menu_item)); - return group; + return gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(vc->menu_item)); } #if defined(CONFIG_VTE) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index bcc06d0e01c7..86c48b9fa5de 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -765,15 +765,12 @@ static int vsock_connect_addr(const struct sockaddr_vm *svm, Error **errp) static int vsock_connect_saddr(VsockSocketAddress *vaddr, Error **errp) { struct sockaddr_vm svm; - int sock = -1; if (!vsock_parse_vaddr_to_sockaddr(vaddr, &svm, errp)) { return -1; } - sock = vsock_connect_addr(&svm, errp); - - return sock; + return vsock_connect_addr(&svm, errp); } static int vsock_listen_saddr(VsockSocketAddress *vaddr, From patchwork Mon May 4 15:59:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 283457 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5F41C3A5A9 for ; Mon, 4 May 2020 16:11:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A3AA5206A4 for ; Mon, 4 May 2020 16:11:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3AA5206A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdh2-00055B-N0 for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 12:11:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdVz-0001RH-IJ; Mon, 04 May 2020 12:00:19 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:42691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVdVx-0005qM-8V; Mon, 04 May 2020 12:00:19 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MAOeB-1jPp1k3wt9-00Btk4; Mon, 04 May 2020 18:00:12 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 12/19] blockdev: Remove dead assignment Date: Mon, 4 May 2020 17:59:49 +0200 Message-Id: <20200504155956.380695-13-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:HYgsKFXXXn5jb8yMhowbBtiXs7B48AJ162XJfhs2pgSxwyfg618 qSD5/LJEl1z1apY73pcyxemslYuJsJZ23b09qAQa6e06UHbu9FCp3LxMkN+a0HBpvVbT+/n RzejGdlY4/mdArEy6qtdXSp2BMaudJXaaEpu3rg2EieVhh4G/1uHdvaDDr2t2M+f8oI1uZ1 d8EEqOrD+ZjkQjs41n0BQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:D98ZUZ4ikz0=:dN9XYPFem0J+MPhvCTRLR4 qslSRBaaITbv2PAE69bUXZZciOluUJD/A8d8OHbwA2SvRyg4jpRSXmHJPznDaHls5viWkBmHW pfYJysZWOSOQGYDE5lX45DUYIJUT+yGWhaS2Jg0vVxdAWcyQGkgh6erUEsD9h3OmETRKeuOTS VqHA5jzT4PceXC878wJFDz1qo6cVFNss4YgDQpIxGMElgPQT6BH+c8VJ9VNEuby/Q+QYb769H PgzABVGLKx4hXnaRaFE/BKtka3eL2at2OSWpTW/U4VZLxt6UwwSs1rRuvS9tLr9u5rclwoBpJ ZJLmDeFCS8VFQ6rUHRuqc1SyNcFrI9dApBPcSz5L7NCjHieAvI+X7JXcAetP+w2VKtfpxfOIx /xbULrptFrMR5BDiMpS2CZ+NYsVmBnT95qJVMEvq9iaqoyug8xGhodNq4kfy/mNKMN2UNCCLc a4vkqjI8eQP1hJscKIQxrbvo2p88fXSMlfNLat2vuDLSGVtjJphLIgjQFo6dgy0tO4zyNwaSO lf/8HHcanAGbm0XOSmAj4qM/yFEyRzGOfbYiGTRzV3WK2S+ujNggzvigryzCf3ZxkFEj2Vl+r sIL+yYeaqb3ZL3IHHkb9NwafBRo+PI2zUYYJhocNo/JPPaa+uvMN+L2sRZ0ufm/or414GIGSY v95Sf/I2OmAix9NZ85JWTFriEOQnpY4fw4AqXocWjsC6zZ7gRHhC3/f8z5futGavMCIPgUCUK OddrUcnj0zEyNuNIeimvPt+luUwv0w7JBno4LeRRv1pQEIDbrv8ona63Os5P4927U9HiSZ4YU I9broP6297RbcBV6TekKfBZNDxAnVUgapx0JDB2TCl8XnQNcRqPybcwP9c4HQV+UBMncn5s Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 12:00:07 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev , Laurent Vivier , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Fix warning reported by Clang static code analyzer: CC blockdev.o blockdev.c:2744:5: warning: Value stored to 'ret' is never read ret = blk_truncate(blk, size, false, PREALLOC_MODE_OFF, errp); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported-by: Clang Static Analyzer Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Max Reitz Message-Id: <20200422133152.16770-3-philmd@redhat.com> [lv: fix conflict because of "Add flags to blk_truncate()"] Signed-off-by: Laurent Vivier --- blockdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index dc1a0c7c2fd4..708d0c323fd2 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2741,7 +2741,7 @@ void qmp_block_resize(bool has_device, const char *device, } bdrv_drained_begin(bs); - ret = blk_truncate(blk, size, false, PREALLOC_MODE_OFF, 0, errp); + blk_truncate(blk, size, false, PREALLOC_MODE_OFF, 0, errp); bdrv_drained_end(bs); out: From patchwork Mon May 4 15:59:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 283455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C43C6C3A5A9 for ; Mon, 4 May 2020 16:15:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95BB0206E6 for ; Mon, 4 May 2020 16:15:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95BB0206E6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdkJ-00020X-NE for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 12:15:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdWA-0001Z8-89; Mon, 04 May 2020 12:00:32 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:45347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVdW2-0005uo-4r; Mon, 04 May 2020 12:00:24 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mzydy-1jBTXE2WIA-00x2jx; Mon, 04 May 2020 18:00:14 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 14/19] hw/input/adb-kbd: Remove dead assignment Date: Mon, 4 May 2020 17:59:51 +0200 Message-Id: <20200504155956.380695-15-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:pP2iFbrOwoCpjoZYcWB3oBDpYLt6NWP4+aZCPwxjbAxZq1NP7vT cP4L6qVJLBhsmINheshkGRXS+F4MzzZBKKZc18YI+4Oq5i8AzUeDs7Pg0cQRcpHOmQ4V7A2 Gy6KcE+H144TPF1CPuFhbGGvBm2je2fzRBYYjNE08VCFC5rvCmUbCbWryfBLbEukjFUkcXK BK13xnR7ESjMXkVwH0rEA== X-UI-Out-Filterresults: notjunk:1; V03:K0:Uu7VC6fA5c4=:Kx4jAe/Bslcq3RWJoegR7A pkq1FlvFj1fMWyRFZJwvH1KCfybx+H6yA/Sf5sD6Uldoe8o0nv9AuNHqvYNox97PSaOvN3Ldm TXPO1ZY2yq9Ej2mcegb1y3nlJkxwZurSQF2+v8mgmvMam2o90mDPIdGinVkQQwP0WNb9J2Hp3 TkzC1nf+JPOX0GyxSvTVQGyRKZoXlsGUH7Aj28dv0IX2CBr0AqHk7JFMoVqx9BJNcS+6RowGv bSDHerG2BVm2emdaAUZEQr2mVbteTzqqcTNd/39tRyHdjDn/II89366QW/bDl1IIrbuXhcZfi u1DNI1TJAgbZ7z5N898AUIgLsA6INqphZGkYMlX0nxo+MZ0SPO484gG/yvd+3YkAk8eRtnPvP CyeMyKDXsxE8taBRvpQcAcW04L9W8XsjkdaYtyawfWXqvYZxuhQZmHZp+00FpUDRI7viKMt/0 AnWtXoOAMwHoUnjLClGBhXeo1ltBo5wfmJizxKpO0my4Oibsqh0fo4+AW1CmkhTpbrHxI2iM8 +vWa3o0BQwrc1mqPJqIHDNN0UhiAk3OYMU5kUoYbmDMmDazAVvURmUZA9HTh1Pj5OnQftToOm R0NeUs4m2aI6kf6jivUhAyuUHG5HQf+nbRJ4wZOoKFQRe7qHA0Nan2YkDSQ5jTwtn9BnZnyis fwYmZmDlLNH71dwN+XC33vQMeQgUE0PqMRKRKTiEm+qelTvJdKSSRnYmjKIvH6JG9RmBzJW4o 6WY5wdYuezClJzeyBhGb/1D/Tho4rZx317ixn/4TUuMGsBkfwXTnFqMp5Dqb3ELpJ6ks8Fy28 NiPaji83ueETH6nGulc5IC26XLmvIVLsZwRIv2in7tmKNQT9tZqTLE8UaCBOP4O5X93RFWw Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 11:59:59 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since commit 5a1f49718 the 'olen' variable is not really used. Remove it to fix a warning reported by Clang static code analyzer: CC hw/input/adb-kbd.o hw/input/adb-kbd.c:200:5: warning: Value stored to 'olen' is never read olen = 0; ^ ~ Fixes: 5a1f49718 (adb: add support for QKeyCode) Reported-by: Clang Static Analyzer Suggested-by: BALATON Zoltan Acked-by: David Gibson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200422133152.16770-5-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/input/adb-kbd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c index 0ba82075897f..a6d5c9b7c9ac 100644 --- a/hw/input/adb-kbd.c +++ b/hw/input/adb-kbd.c @@ -195,9 +195,7 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) { KBDState *s = ADB_KEYBOARD(d); int keycode; - int olen; - olen = 0; if (s->count == 0) { return 0; } @@ -216,7 +214,6 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) if (keycode == 0x7f) { obuf[0] = 0x7f; obuf[1] = 0x7f; - olen = 2; } else { obuf[0] = keycode; /* NOTE: the power key key-up is the two byte sequence 0xff 0xff; @@ -224,10 +221,9 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) * byte, but choose not to bother. */ obuf[1] = 0xff; - olen = 2; } - return olen; + return 2; } static int adb_kbd_request(ADBDevice *d, uint8_t *obuf, From patchwork Mon May 4 15:59:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 283456 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48526C3A5A9 for ; Mon, 4 May 2020 16:13:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C9312053B for ; Mon, 4 May 2020 16:13:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C9312053B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdiq-0008Gh-6N for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 12:13:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdW2-0001Vc-KU; Mon, 04 May 2020 12:00:22 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:36561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVdW1-0005ud-D3; Mon, 04 May 2020 12:00:22 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mum6l-1jF4ZA1Blz-00ro4i; Mon, 04 May 2020 18:00:15 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 15/19] hw/ide/sii3112: Remove dead assignment Date: Mon, 4 May 2020 17:59:52 +0200 Message-Id: <20200504155956.380695-16-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:lgVrMoml8bYCxI2Y+gJetK2X5PYyHDeGI0vM/BCBrUlgBU4vesB pRo0wzORuvfwE6X1WN6sO4awT/cBaHaEpkBIzOrb29e5qRkF+DKKulCYWiTbiTZW36AZe2x y/ETeVuZ8C2ddWYrFex1exTvGsxSi+yDXW4fSY5Dw8hwzWPiQpYfDZJnA9C5ZSBZKSb9ybR IC6zji8W6X/W4oy8SENJg== X-UI-Out-Filterresults: notjunk:1; V03:K0:MLrnwyS2kLE=:ZgXkqqoKPTBCTYfeCGH6gQ XtapdkH+03aGfU9tO3cD5rcUDIUa7Kmv2JFRyUK4TuL4SJaaDLOZMZy31FopHZskQ1YjLKOuQ pwnaQSqvtSuGa8ylCGgPJMItsKfB/HnG0QKaIg5n1opTetZYqofbzQbWlalX0wJa/NUdX6EXx vdo4BocXO1gfXZBbuN5GqDxqZG6oJUMdowPRqx9dX/nPIliJZp1WkMLaL2YWXFFLfz1J/3w30 sbXJ53rm447U60SAwL0zcCU2IFrUCuJhA8SX1MI9MdPZQHmDUucF4UkiqdSJptpK+eXw3emtu BvCucf1+d/T4MHD/LVeVMJenqogQduQYiC60LHfQoEO3PcdH/8qz033F4JqVl/YER6g8BbjI3 /lVJ4gBYYTpcSs6LeWB3Yy6HikW0pTkxU4Rz+EdYPqm4WPnfsbPPHa8gJtRicrta8oHgOb2dR rvH2w1UCXSG1wiZLPk1USl7c8Z0CGYrtvStX6PZgijUBQ+C+F5F2zTig3gciXWq5/nzXDNqUs lvKXxx9hWlUqxdJGoL4yofnTlFRUymiMCfKzCGTzPBaQqaMfEjwH7Y0QwGXZjwE0ULNE3CH1k dDdLaSI0wGID0f+0GToBhZbUGnG1hl0Qx2xHtt3MNTnC7VA3RwiBMkhldBahT++eFhvwRKV4b uO3trKmrqgiH9lDby5xB1VXBc6RVbl8qiJ8pRONk4dH45bCKPUb3M816Omb0cXp2Kj8MsjCpH ZF7CUzODPyXCB4hm1twQ4LqYq9OX225rWoSMdSiixXSlDPAZu9LASjEI7kHEs7miGBBUVRMAp NU7Pp+Fh4SQDOkjVWkaFXeMwsVjFnsZwklqbFVuYUJStHVQGwapKacITYiRmUEIwt0ibX2+ Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 12:00:07 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: qemu-trivial@nongnu.org, John Snow , Michael Tokarev , Laurent Vivier , =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Fix warning reported by Clang static code analyzer: CC hw/ide/sii3112.o hw/ide/sii3112.c:204:9: warning: Value stored to 'val' is never read val = 0; ^ ~ Fixes: a9dd6604 Reported-by: Clang Static Analyzer Reviewed-by: BALATON Zoltan Acked-by: John Snow Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200422133152.16770-6-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/ide/sii3112.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index d69079c3d9b7..94d2b57f9535 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -42,7 +42,7 @@ static uint64_t sii3112_reg_read(void *opaque, hwaddr addr, unsigned int size) { SiI3112PCIState *d = opaque; - uint64_t val = 0; + uint64_t val; switch (addr) { case 0x00: @@ -126,6 +126,7 @@ static uint64_t sii3112_reg_read(void *opaque, hwaddr addr, break; default: val = 0; + break; } trace_sii3112_read(size, addr, val); return val; @@ -201,7 +202,7 @@ static void sii3112_reg_write(void *opaque, hwaddr addr, d->regs[1].sien = (val >> 16) & 0x3eed; break; default: - val = 0; + break; } } From patchwork Mon May 4 15:59:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 283458 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04035C3A5A9 for ; Mon, 4 May 2020 16:10:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C83E6206A4 for ; Mon, 4 May 2020 16:10:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C83E6206A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdfq-0002vy-P4 for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 12:10:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVdWC-0001ZQ-FV; Mon, 04 May 2020 12:00:32 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:45005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVdW4-0005vt-CF; Mon, 04 May 2020 12:00:30 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M6DnM-1jTPWT0W6a-006j4Z; Mon, 04 May 2020 18:00:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 18/19] hw/timer/stm32f2xx_timer: Remove dead assignment Date: Mon, 4 May 2020 17:59:55 +0200 Message-Id: <20200504155956.380695-19-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504155956.380695-1-laurent@vivier.eu> References: <20200504155956.380695-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:qxdoGuaJgcZVXFMomeoMipdxOGTmfRSKzrzZ1+ElAkoow+kUJ83 u8od6N6H5ai8BOX1hN9KMddULnYP4insHijJG6CkRSw+xhEO7zs0AfMIjHu6q1q3zLon1uV iUhPOeshATsMc3vRBaou2OlM8jJnTNUXGoHHfkQO6/5OJssIJkLuNVOpTb0yuccM9TfcCRo 2BqepeuXLSb/FVAglxl4w== X-UI-Out-Filterresults: notjunk:1; V03:K0:L5QC1KieNE4=:BOwao/wXgbG5vjRfiqbkCo pnDCpd0wOj2sXIdKAL0yDgJ+sgwfEKQEUs35OJ6uoOO3rujEnQlDaxODQpS7GQ/bDUxIE8cX7 zJYA7IhAkeHOdyAZdvAFkOOym+pepR+k9Eaa/pOW0VgJxN+UKehkbZuxBoeSTwxGEK/+Hh5Nw 5hNscS7h47/hGJ2p5ZE0yg3fCP3mGv8ppFk90xPhadHw0q2PKJo4R1PCkbYrgyXoI4IhQilXO 3o2zhs1pIc/mVa4l6SpdsXMKHg6GKHxB2ZDZ/R/LOuNek5Fx6FWDNrJUezjq+1LJwF8sqXssx FoCmgctiVDKxh16ipZ4HtbrGFZkb29O6fvXf2+xWp959LdCIQ5l1MLu0ZGI3y0OFW07rgGhDX crt0Xu0UbEkDyFNo40/m8xO5LmsYQ6MqB1bs664d3/xkGn5fs6Yz3J7wyghYm9Qx4MMnSxmQY 4jjK6pMWxu27VXy1TDMMZA+djTdEPVvw2f17x9lwAD6/7wSSBm+j0r1hZJUkXMxD/RqEW8U5C c62MXpzdinOXUNmaBDt15KhMGr25UIsxlbnsqBSLT6DcOM+pl3M377wzKLOGQF7oYQuWuE5uB 5X6k/hx0dr53at3PaZrhNO6Gl7/ORQ1xm4Y/gR6CiUPU4Cs+QF9/A/Oz/c2UkBhYP+/YkJ9zS MOcr8duDlXLEGkgThtqV1X3006g8bJLcJ8RFiSABaMnDktySh8huYW/HtUuM2nQuJqjgAqAms uNlF2OUdjNgPG0SFdlLyAOHixxe0beOroXKi2ESMHUnppLDXOHH0gu7Qc+Cx5zmLAzchAt1kb oMJbEUirqm1VdCTnAB9ewn41+7/ovtiPELzRX6lDPATayCcH0LaxNVHvFW0/eiOGkYNuSIB Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 12:00:20 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alistair Francis , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Fix warning reported by Clang static code analyzer: CC hw/timer/stm32f2xx_timer.o hw/timer/stm32f2xx_timer.c:225:9: warning: Value stored to 'value' is never read value = timer_val; ^ ~~~~~~~~~ Reported-by: Clang Static Analyzer Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200422133152.16770-9-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/timer/stm32f2xx_timer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index 06ec8a02c250..ba8694dcd349 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -222,7 +222,6 @@ static void stm32f2xx_timer_write(void *opaque, hwaddr offset, case TIM_PSC: timer_val = stm32f2xx_ns_to_ticks(s, now) - s->tick_offset; s->tim_psc = value & 0xFFFF; - value = timer_val; break; case TIM_CNT: timer_val = value;