From patchwork Wed Sep 2 08:07:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11750089 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C058109A for ; Wed, 2 Sep 2020 08:09:07 +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 1EE712084C for ; Wed, 2 Sep 2020 08:09:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RbyLJH4R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EE712084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDNpK-0007Jk-6c for patchwork-qemu-devel@patchwork.kernel.org; Wed, 02 Sep 2020 04:09:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDNoV-0005LE-SJ for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:08:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDNoT-0001hr-J5 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:08:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599034092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IPF1JmHQsw2mw4z7BQY/4JOe6Rk75NCWTSoQBVL6aXM=; b=RbyLJH4RXi2VcDu7JSpuqS7RIOtiyaEfdh4Prv6Bpfix9yaaAt8d6/vmZQuNJUwU9rSnvm K6HNGgvDrlK4vm1IoeZhUBJQfI+VXYpNhB1RWrPdQnjoaBOMqc3/B8xQUJnoqN3xcvjxWL OGd6549vCft1y6HFBdKGy4bAoZ5Ih+Y= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-276-8gA_yGWpPbaWwBafFIZSJA-1; Wed, 02 Sep 2020 04:08:10 -0400 X-MC-Unique: 8gA_yGWpPbaWwBafFIZSJA-1 Received: by mail-wr1-f69.google.com with SMTP id 3so1652314wrm.4 for ; Wed, 02 Sep 2020 01:08:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IPF1JmHQsw2mw4z7BQY/4JOe6Rk75NCWTSoQBVL6aXM=; b=V3qTSpKdWLbKa3Jn+5LRR96EvPDdqOwaRznfSW2hAGL0gQCxQ1a5J7w7cyOWJY+ymI xwuDyvxDpaFRvMg+6gw/szDoMUGsJUnAy0/bu+AhtdLjUJT8gSYaC56W2LNWc22tKB0N rNsMa3V4YfLMyVXyqjfckn2Htm5rIVHtVepgdXE1ktLVL3M8xUvrzonHR9NxoOsv55I2 YhiZXPrqcoqL/bVf28AUnvTG78tQ2pT91a/v2CUVfK6tZr5YbbuJ2RSF2nUE7ioERWyC 8t4Is82KRmAdwRYouC5DZQHm3oBlbdIo3MIfdW/EQFbLPt1xDw1enHPLvWL7O9L2kNLZ tZMA== X-Gm-Message-State: AOAM531UL7C0YT8b5rsEnZH73c5ctzFbEWV08ImsiTwJcMNj7IMJDMRM pmw12s0EPIyirKioiw7/t4i655w5aVnolPjYH7bPrAVHsojGHqvaoIMBPaaygZ2Z28Vp0a2CF0i G/9FOls0+zB947gM= X-Received: by 2002:a1c:3c42:: with SMTP id j63mr5834688wma.53.1599034089485; Wed, 02 Sep 2020 01:08:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxW0XYpgcnPnvy8YKh/9V5gsyJxMZdgNgUKfw5PiBuuQ1ZE0VXGs6olHM8kzbTBpoZq7XIpfw== X-Received: by 2002:a1c:3c42:: with SMTP id j63mr5834649wma.53.1599034089270; Wed, 02 Sep 2020 01:08:09 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id q6sm5093038wmq.19.2020.09.02.01.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 01:08:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/5] tests/qtest/ipmi-kcs: Fix assert side-effect Date: Wed, 2 Sep 2020 10:07:57 +0200 Message-Id: <20200902080801.160652-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200902080801.160652-1-philmd@redhat.com> References: <20200902080801.160652-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Laurent Vivier , Thomas Huth , Corey Minyard , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Fix assert side-effect reported by Coverity: /qemu/tests/qtest/ipmi-kcs-test.c: 84 in kcs_wait_obf() 83 while (IPMI_KCS_CMDREG_GET_OBF() == 0) { >>> CID 1432368: Incorrect expression (ASSERT_SIDE_EFFECT) >>> Argument "--count" of g_assert() has a side effect. The containing function might work differently in a non-debug build. 84 g_assert(--count != 0); Reported-by: Coverity (CID 1432368) Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Greg Kurz Reviewed-by: Thomas Huth --- tests/qtest/ipmi-kcs-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qtest/ipmi-kcs-test.c b/tests/qtest/ipmi-kcs-test.c index 693a6aacb52..fc0a918c8d1 100644 --- a/tests/qtest/ipmi-kcs-test.c +++ b/tests/qtest/ipmi-kcs-test.c @@ -81,7 +81,8 @@ static void kcs_wait_obf(void) { unsigned int count = 1000; while (IPMI_KCS_CMDREG_GET_OBF() == 0) { - g_assert(--count != 0); + --count; + g_assert(count != 0); } } From patchwork Wed Sep 2 08:07:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11750091 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 76BA8722 for ; Wed, 2 Sep 2020 08:09:12 +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 4A9142084C for ; Wed, 2 Sep 2020 08:09:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SM/0PUwL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A9142084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDNpP-0007Xs-Bb for patchwork-qemu-devel@patchwork.kernel.org; Wed, 02 Sep 2020 04:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDNoc-0005XV-6v for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:08:22 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37265 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDNoa-0001ix-Gw for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:08:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599034099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MkSNcsho6DvA/UdVRqB8QxEaCIKTx2/65WBDZF1cLy4=; b=SM/0PUwLFrrc6Xpzr+h6d6+hARpHEuYdp6+CUqhOLWvWEws5Wl6hCUKkgzrKg+hpWdWYAH IZDED/iMzK5/eUWWmm+h8P/hhFQa7ljF/z24T8ZW+EiaiESbPfXBwImwdl7aw975WY9x/k bVp0/8yuW/M7Q0OtjXz3WbYrs7wFTxA= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-258-_FknG71kOmS8uwVFusLCjA-1; Wed, 02 Sep 2020 04:08:15 -0400 X-MC-Unique: _FknG71kOmS8uwVFusLCjA-1 Received: by mail-wm1-f69.google.com with SMTP id a5so1300402wmj.5 for ; Wed, 02 Sep 2020 01:08:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MkSNcsho6DvA/UdVRqB8QxEaCIKTx2/65WBDZF1cLy4=; b=DmRL7hmykXNnD2PHWrK6ySoz8FR5G3SbBLwZv43JpqiM7i7MtHWE4ng0YQKCxhtxKi sK6A4Q2iujZAEseyLfab7x6tG8Rbqks/Gr4KSh2UmgP5Lb7ODiZ+lof+EDM+FEyjqHe+ l++T4Y/bW20m7Uz4KUBDE2BH37F0gnLv5fnyztQwOJ3hLphd31GvfwA15x2DS0ZDBbLH tssk1BrTnZLvgw4ic0Goejpmv1GWScZ7Te6a6GMdistRDTsRqUuwZsBM6v2CJP+d1FXQ XDgVrYKasK1+bG8O3ysLBK4Ilmr+ajjrInTjCmSmSPUOEuhSe3c5qON2K9aF6j23Qvrc gTRg== X-Gm-Message-State: AOAM531MG3D7D53By7T/8QMnTHtwg/6RjA2kXGv+Vhp7x6rOwMVI//HU xELx49M+keV42qSExw4gYPfIFlaX05Dxf266fwSRUzo2dLr3UFtldr0iFvBNCmCErShFSFqIt23 rxsLzsclJY3RtqOk= X-Received: by 2002:adf:ec45:: with SMTP id w5mr6180031wrn.357.1599034094565; Wed, 02 Sep 2020 01:08:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpW0HtuwgcfIsS0tmj4gTF5kz37mBKmxNbyWVAJiejxYlEqVGG4KgJToxdFjgwM6KLilLpuQ== X-Received: by 2002:adf:ec45:: with SMTP id w5mr6180002wrn.357.1599034094363; Wed, 02 Sep 2020 01:08:14 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id q12sm5217629wrp.17.2020.09.02.01.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 01:08:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/5] hw/pci-bridge: Do not declare local variable only used for assertion Date: Wed, 2 Sep 2020 10:07:58 +0200 Message-Id: <20200902080801.160652-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200902080801.160652-1-philmd@redhat.com> References: <20200902080801.160652-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Laurent Vivier , Thomas Huth , Corey Minyard , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This variable is used once in an assertion. Remove single declaration and access directly in the assert(). See in "qemu/osdep.h": * [...] disable assertion is not * supported upstream so the risk is all yours. Meanwhile, please * submit patches to remove any side-effects inside an assertion, or * fixing error handling that should use Error instead of assert. Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-bridge/pci_bridge_dev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c index 4a080b7c7bf..10c521085d7 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -224,9 +224,7 @@ void pci_bridge_dev_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, void pci_bridge_dev_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - PCIDevice *pci_hotplug_dev = PCI_DEVICE(hotplug_dev); - - g_assert(shpc_present(pci_hotplug_dev)); + g_assert(shpc_present(PCI_DEVICE(hotplug_dev))); shpc_device_unplug_cb(hotplug_dev, dev, errp); } From patchwork Wed Sep 2 08:07:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11750097 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 232BB109A for ; Wed, 2 Sep 2020 08:11:07 +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 EADC22072A for ; Wed, 2 Sep 2020 08:11:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gSYrSyQq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EADC22072A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDNrG-0002w6-3Q for patchwork-qemu-devel@patchwork.kernel.org; Wed, 02 Sep 2020 04:11:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDNpJ-0007KW-3J for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:09:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27103 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDNpH-0001pr-9p for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:09:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599034142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a7jMiaMP3JTj9ArNnNz3t5AwgDboPnJ3Xc9W3czcTi0=; b=gSYrSyQqFeKPNRUVg5xs9FTlYxgBJGnxpo+/lU6K8i5m0VwgPIon8qF0XBHbcmFO+d4W60 tC18G0y9BC9u3r1m3yQ0Ots9POuhay6jUHgDaJjuhLbf8YbivOMY/FYLsSVAbj8j7wCwsC 8Tr0xS/5htNwMqUPE920djacyz0NdH8= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-tA9ROLyJNHesKY1F7FsvFA-1; Wed, 02 Sep 2020 04:08:21 -0400 X-MC-Unique: tA9ROLyJNHesKY1F7FsvFA-1 Received: by mail-wm1-f71.google.com with SMTP id x81so1528918wmg.8 for ; Wed, 02 Sep 2020 01:08:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a7jMiaMP3JTj9ArNnNz3t5AwgDboPnJ3Xc9W3czcTi0=; b=iEFqq/1MhNld3WvZBIClqLJX1PwV5pNZYys6KCKoSOHxVEet03badQTbECsUDMvHvd hDxO51dhauVT61dsoftn54A5jy1PS8EK1Aj+2I4bhsCNqMaoFPjAibjIJ3K4rNIQzYDL f+VtubO0hvU1KJ7OLUdIQtMcWMgJaVXyZH4ua9hd37sjAcqQS25SjvRbpNCgaVAdvphh LkMRnTUPQbzDnt2r5Kz4ulR9JP4qA2JY3kSAtavCgryIP+WCZesdZ955FpmK+OBUw/h5 T4BMkAyA0XEuqZrWitAkD5wlzP0DEUfsm2ry+8OErIo/ONMfICzzAtaMbRbWEFcY0z6F 8Qog== X-Gm-Message-State: AOAM533+8OVCWEQlT7QXwSHeZ1e0qqFXej2PLftIxPtxPx0tC8zkd3QY dpsIZWT5Z9v5CsfyVSpw1yqnZqLFz7B/OsibWhpomMPOEaYXwpoYH7Z4B4PiSWDXAOuNCOUSMjl ln2RcVYR7DO3n/j8= X-Received: by 2002:a5d:4f12:: with SMTP id c18mr5474572wru.33.1599034099693; Wed, 02 Sep 2020 01:08:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFGqDIQtOUHFPGW0jIgS+ZVOQ2QN9WUI/lkiDw5q/wumx2PXzT/kP7sMdPSLVt6uHcfzlU6Q== X-Received: by 2002:a5d:4f12:: with SMTP id c18mr5474545wru.33.1599034099473; Wed, 02 Sep 2020 01:08:19 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id 70sm5642929wme.15.2020.09.02.01.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 01:08:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/5] hw/ppc/spapr: Do not declare local variable only used for assertion Date: Wed, 2 Sep 2020 10:07:59 +0200 Message-Id: <20200902080801.160652-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200902080801.160652-1-philmd@redhat.com> References: <20200902080801.160652-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Laurent Vivier , Thomas Huth , Corey Minyard , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This variable is used once in an assertion. Remove single declaration and access directly in the assert(). See in "qemu/osdep.h": * [...] disable assertion is not * supported upstream so the risk is all yours. Meanwhile, please * submit patches to remove any side-effects inside an assertion, or * fixing error handling that should use Error instead of assert. Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/spapr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index dd2fa4826b3..6447a5b3808 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -628,7 +628,6 @@ static int spapr_dt_dynamic_reconfiguration_memory(SpaprMachineState *spapr, static int spapr_dt_memory(SpaprMachineState *spapr, void *fdt) { MachineState *machine = MACHINE(spapr); - SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr); hwaddr mem_start, node_size; int i, nb_nodes = machine->numa_state->num_nodes; NodeInfo *nodes = machine->numa_state->nodes; @@ -670,7 +669,7 @@ static int spapr_dt_memory(SpaprMachineState *spapr, void *fdt) if (spapr_ovec_test(spapr->ov5_cas, OV5_DRCONF_MEMORY)) { int ret; - g_assert(smc->dr_lmb_enabled); + g_assert(SPAPR_MACHINE_GET_CLASS(spapr)->dr_lmb_enabled); ret = spapr_dt_dynamic_reconfiguration_memory(spapr, fdt); if (ret) { return ret; From patchwork Wed Sep 2 08:08:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11750093 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69705161F for ; Wed, 2 Sep 2020 08:09: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 3BF3C2087E for ; Wed, 2 Sep 2020 08:09:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="N5LTwisP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3BF3C2087E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDNpT-0007hi-BK for patchwork-qemu-devel@patchwork.kernel.org; Wed, 02 Sep 2020 04:09:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDNom-0005xr-Ov for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:08:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDNol-0001l3-3W for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:08:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599034110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qqoGra6YF9Ce6QcGdVGR0NnxjhhD6ItqfGW+etggexM=; b=N5LTwisP9LCXsDsNkLQCHrgdCP4Tohjy9cxMSIcNqGm+36cHvMxiS+puy+3P+gETckyqqC gbW81UIAsfFvh0fv2EAi/KeDPx2EmWIiHpnSeAxjMQI3kGB10JDwXvVtOdhM/PyOhGYOYP 9sQK81eezzovrBTSFZQUdgBcSWBnAVg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-437-TrFtfc9MPWWqAD9TJT36EQ-1; Wed, 02 Sep 2020 04:08:26 -0400 X-MC-Unique: TrFtfc9MPWWqAD9TJT36EQ-1 Received: by mail-wm1-f72.google.com with SMTP id k12so1108419wmj.1 for ; Wed, 02 Sep 2020 01:08:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qqoGra6YF9Ce6QcGdVGR0NnxjhhD6ItqfGW+etggexM=; b=rVrEvgn2OVv82Tm0Y0G9hYsn7gKha5q0TdMsIJjLGp7bos8WZFpyR23X2eDDj1pbXA PRxjopIoHv/7MR5rOXMmo3hiH5Og6+cxcgdH9Bav8fLVPtBaDmZ1U226IyoHpc2vGV+8 Fhj6B8LdPPm3U23eJooROz9+JHFx8gjRLDAMP5yrfuGs0yH567ZIAz6jrENLwI3i7JPG sfg7MEN3EOXdHvTQPz5E2/IL2Zf1/tvC1r8QRSO/65xn/dILQMSRVssvg/LLDYX/ElA8 qbbY/3amLIzfXT8qTN0spLjVN0++3d9IFnqazieZh6PATXO3HICLthZ3LrvBqbM0FmuR mgLg== X-Gm-Message-State: AOAM530uGS2a0iEYLeGHK3TQgCZdim2rBzW/vu9iZeH9xgV/nxZBhJ/4 LjHO0wKS359zHHI3vM9uh8Nao3pR2oJvn1kZBUXi+jmk/uOmvV06h008U4xDiAicv0jAOTF5gAn radP5t1kHKZiceYk= X-Received: by 2002:a1c:2b04:: with SMTP id r4mr5304996wmr.76.1599034105338; Wed, 02 Sep 2020 01:08:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhMl1QiX60uBZI3rBLSdHTG2Ml6h8GrTYZUS2VqvWLkBp44hIuMHZxZN5lK/+XKS+Vhksetw== X-Received: by 2002:a1c:2b04:: with SMTP id r4mr5304974wmr.76.1599034105170; Wed, 02 Sep 2020 01:08:25 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id b194sm82986wmd.42.2020.09.02.01.08.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 01:08:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/5] tcg/tcg: Do not declare local variable only used for assertion Date: Wed, 2 Sep 2020 10:08:00 +0200 Message-Id: <20200902080801.160652-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200902080801.160652-1-philmd@redhat.com> References: <20200902080801.160652-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Laurent Vivier , Thomas Huth , Corey Minyard , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This variable is used once in an assertion. Remove single declaration and access directly in the assert(). See in "qemu/osdep.h": * [...] disable assertion is not * supported upstream so the risk is all yours. Meanwhile, please * submit patches to remove any side-effects inside an assertion, or * fixing error handling that should use Error instead of assert. Signed-off-by: Philippe Mathieu-Daudé --- tcg/tcg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 62f299e36e5..0bff49e544a 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -777,7 +777,6 @@ void tcg_register_thread(void) #else void tcg_register_thread(void) { - MachineState *ms = MACHINE(qdev_get_machine()); TCGContext *s = g_malloc(sizeof(*s)); unsigned int i, n; bool err; @@ -795,7 +794,7 @@ void tcg_register_thread(void) /* Claim an entry in tcg_ctxs */ n = atomic_fetch_inc(&n_tcg_ctxs); - g_assert(n < ms->smp.max_cpus); + g_assert(n < MACHINE(qdev_get_machine())->smp.max_cpus); atomic_set(&tcg_ctxs[n], s); if (n > 0) { From patchwork Wed Sep 2 08:08:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11750095 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ABFAF722 for ; Wed, 2 Sep 2020 08:10:51 +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 7FDFA2072A for ; Wed, 2 Sep 2020 08:10:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="V7eLTBbM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FDFA2072A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDNr0-0002fG-KG for patchwork-qemu-devel@patchwork.kernel.org; Wed, 02 Sep 2020 04:10:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDNor-00069Z-Bp for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:08:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:31012 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDNop-0001lf-OB for qemu-devel@nongnu.org; Wed, 02 Sep 2020 04:08:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599034115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IPGPiB1QKs5CSZ+0D2TKHKMlGexrsgYUk0usBoV2JpU=; b=V7eLTBbMPQK7wLs4HZi5AZSM7Ss3Zf5v5CC1dLXVxa2zsQww62n3WFthG5UYx9AajvnatZ 1RD851mDW00Azj1f3zV9Fk8ZLgexflNjhFZwEqx/4E89l8ezgmxkTcWVPW1dTBSHcaAcbP oUIyQK5HeDaJ4Z1RWUBjcGFCSsidNOg= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-406-xmHkW446PuaQcKFzGlLS1g-1; Wed, 02 Sep 2020 04:08:31 -0400 X-MC-Unique: xmHkW446PuaQcKFzGlLS1g-1 Received: by mail-wr1-f72.google.com with SMTP id k11so1639229wrw.16 for ; Wed, 02 Sep 2020 01:08:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IPGPiB1QKs5CSZ+0D2TKHKMlGexrsgYUk0usBoV2JpU=; b=KNPzT4sYWPL0ojJpgnZPZwWpAAsXaPvhYFSyxaDqFAQH7b4kq0zksrEkJmemClYhAx I3ZC9n4u3StrEiITEAGmBibLVlM7fXCQQT+gBkSaz4YNieVi9nZ8CJ0LqNWUPvoIUCx3 rDzIRkEJ79fxHSiviOBz5FSdyCgJ5FHSm9kzAuFlfwsxbUr6f6PWcLfMA9Mvf8vQeGem wB7kFnTlFA68tqj85sYBL7f7J9CO6jA+MeSy2iC98ngSfL10h68nbeRRQtHb+FC5AjzL 4sVngOIJBJKIqaDJ4yiPHmT/TqoMVQAt4tPB5r1MiiB51dshL7RBXmxdRqD/egiRYIkO 1GJQ== X-Gm-Message-State: AOAM532T3fy8LivN/aOGfFrSXmrDTjyMVkSb54HbTx2cX3Z3MXbqjCxr fluOD7eD//u2ZikGmwT1oFW63Tz6ih1xvwuXhOR9o3RoAzfqxdkpQsY1USR2maRc+LXmKRyZQ4b vaQlpogysfkEvSvA= X-Received: by 2002:a5d:4949:: with SMTP id r9mr1493761wrs.27.1599034110191; Wed, 02 Sep 2020 01:08:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWlP3zIU6c2cv0vrpsCyddH9464yfvzmcKWfRGRoxhqImfNkE+p33PY74ZHfGcY0Zao6U0kw== X-Received: by 2002:a5d:4949:: with SMTP id r9mr1493740wrs.27.1599034109985; Wed, 02 Sep 2020 01:08:29 -0700 (PDT) Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id a15sm2887216wrn.3.2020.09.02.01.08.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 01:08:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/5] util/qsp: Do not declare local variable only used for assertion Date: Wed, 2 Sep 2020 10:08:01 +0200 Message-Id: <20200902080801.160652-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200902080801.160652-1-philmd@redhat.com> References: <20200902080801.160652-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Laurent Vivier , Thomas Huth , Corey Minyard , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This variable is used once in an assertion. Remove single declaration and access directly in the assert(). See in "qemu/osdep.h": * [...] disable assertion is not * supported upstream so the risk is all yours. Meanwhile, please * submit patches to remove any side-effects inside an assertion, or * fixing error handling that should use Error instead of assert. Signed-off-by: Philippe Mathieu-Daudé --- util/qsp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/util/qsp.c b/util/qsp.c index 7d5147f1b20..1db044ecedd 100644 --- a/util/qsp.c +++ b/util/qsp.c @@ -560,9 +560,7 @@ static void qsp_iter_diff(void *p, uint32_t hash, void *htp) /* No point in reporting an empty entry */ if (new->n_acqs == 0 && new->ns == 0) { - bool removed = qht_remove(ht, new, hash); - - g_assert(removed); + g_assert(qht_remove(ht, new, hash)); g_free(new); } }