From nobody Fri Dec 19 04:27:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1586881765; cv=none; d=zohomail.com; s=zohoarc; b=COs8FRCZGno3nljSmrQBO3qiU2Dk40QrVt0hBmIVQ3pEaA90mJvw+BB1bA3BmY0CnxzOAMcFK8+GPHzih5VC4jSGcBISgdo4s4smUYCph6saInOOR+J1ciAfbBZ7USpxo2Rbl1TJoRt1SCuYszl38dGdUnYpU6ht/SI0OLI1CVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586881765; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yvyxieRgXTgnaYpRAHFSnkQCJYL7gwucJ9BQHEnE72U=; b=A+hQHCbImjNJiZgA5nhyRAwqf7DZ7aFk1ju0EhVJ7x/E7dUA56Jt0pkLVXVBFzcstVRPOPz5fY2egJh+55GS6KnChcjAAy1I228kghRClD8q2mYGSKzhSzIaUvLtNXfmolrYMkimUsT9oVo20eMirueAU6AWbWe56rcxVuYMpjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586881765335929.9581578530882; Tue, 14 Apr 2020 09:29:25 -0700 (PDT) Received: from localhost ([::1]:34024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOOR9-00027v-RC for importer@patchew.org; Tue, 14 Apr 2020 12:29:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51652) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOOOI-00057I-0W for qemu-devel@nongnu.org; Tue, 14 Apr 2020 12:26:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOOOC-00079x-Cd for qemu-devel@nongnu.org; Tue, 14 Apr 2020 12:26:25 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:38629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOOOC-00079Y-6e for qemu-devel@nongnu.org; Tue, 14 Apr 2020 12:26:20 -0400 Received: by mail-wm1-x341.google.com with SMTP id g12so6879148wmh.3 for ; Tue, 14 Apr 2020 09:26:20 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id i129sm20003802wmi.20.2020.04.14.09.26.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 09:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yvyxieRgXTgnaYpRAHFSnkQCJYL7gwucJ9BQHEnE72U=; b=dsCYQ8FpR5f1yzZHJovafOOVrGN+hbeQLjaxs5CckGpDvnvr5tvobIlieI1LGou891 3lWmb1/4L+0TtDr/zrt1ZIX1nhfegha2HgujbwnS+GXCIShHtkH0ioThszOtAiDZzC6O hv5Esu+UaX2INjPxGvvs9vbJMgt0AafIpzhQGGx004KUv6eDQ/gPVpa0zdxtPYYPKT1p k2fKI+UQLj5VShL7IZZx7rxT8HGgQ+g48Uq5OXYKQpEglxM3LvJ+aIu68MYElAhUF6Vy n/PeMXXKosGCsGULv8qVGmrThjpAbwSg/3Z29TzNsyNnnKgVBeBdW3knvW7lsJ+NlyIl D6Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yvyxieRgXTgnaYpRAHFSnkQCJYL7gwucJ9BQHEnE72U=; b=m254sfJSsdtmhe6eg7CTZlU+cNgeWvv70ehH0+5QjrSOceVM3M7hCRATl9ftagxeVH JlCLvY0q7DLJlO9gEAo2/zAQu8IOe0SEYnTNEJsM3OClw4TYA4PVCrZmLxWb5Is0oF4K aCs0HKtXXbTJAgR5oGatR3EJ8N9osOYbS7IrfzSOUQ0co9Eo/5tQpVnDcMy4bTJaN0v3 S9qw1PAf0BE0XkVtaEK2F1ezVg9zdZ9NtPzotT1zeK5lkM8xj+V8+RYdK4Bjg3rAab6i bUC5m9+CdFeL4TMI84Dl1FB03zbhM8uJEqIo+Nz7t3HMBccHt+vtnXyGHxB2749GpZ+s qoUA== X-Gm-Message-State: AGi0PubzLqWIlinFPJrwTkq2F41bDGE1fQ32GM7an5kKHaigep7ENf0x A4fcOdRVSXv+LnMd7ElcIeTZaKCrbhpsXQ== X-Google-Smtp-Source: APiQypKmQn1sNH2HqX6XhycvF6ValpgAe9rxmZkXPRZa5z+mGnMJd46fq0KBWhij1xS3h8BY7jNpLA== X-Received: by 2002:a1c:e302:: with SMTP id a2mr633636wmh.96.1586881578930; Tue, 14 Apr 2020 09:26:18 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/12] thread.h: Remove trailing semicolons from Coverity qemu_mutex_lock() etc Date: Tue, 14 Apr 2020 17:26:04 +0100 Message-Id: <20200414162613.4479-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414162613.4479-1-peter.maydell@linaro.org> References: <20200414162613.4479-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) All the Coverity-specific definitions of qemu_mutex_lock() and friends have a trailing semicolon. This works fine almost everywhere because of QEMU's mandatory-braces coding style and because most callsites are simple, but target/s390x/sigp.c has a use of qemu_mutex_trylock() as an if() statement, which makes the ';' a syntax error: "../target/s390x/sigp.c", line 461: warning #18: expected a ")" if (qemu_mutex_trylock(&qemu_sigp_mutex)) { ^ Remove the bogus semicolons from the macro definitions. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200319193323.2038-4-peter.maydell@linaro.org --- include/qemu/thread.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/qemu/thread.h b/include/qemu/thread.h index 10262c63f58..d22848138ea 100644 --- a/include/qemu/thread.h +++ b/include/qemu/thread.h @@ -57,17 +57,17 @@ extern QemuCondTimedWaitFunc qemu_cond_timedwait_func; * hide them. */ #define qemu_mutex_lock(m) \ - qemu_mutex_lock_impl(m, __FILE__, __LINE__); + qemu_mutex_lock_impl(m, __FILE__, __LINE__) #define qemu_mutex_trylock(m) \ - qemu_mutex_trylock_impl(m, __FILE__, __LINE__); + qemu_mutex_trylock_impl(m, __FILE__, __LINE__) #define qemu_rec_mutex_lock(m) \ - qemu_rec_mutex_lock_impl(m, __FILE__, __LINE__); + qemu_rec_mutex_lock_impl(m, __FILE__, __LINE__) #define qemu_rec_mutex_trylock(m) \ - qemu_rec_mutex_trylock_impl(m, __FILE__, __LINE__); + qemu_rec_mutex_trylock_impl(m, __FILE__, __LINE__) #define qemu_cond_wait(c, m) \ - qemu_cond_wait_impl(c, m, __FILE__, __LINE__); + qemu_cond_wait_impl(c, m, __FILE__, __LINE__) #define qemu_cond_timedwait(c, m, ms) \ - qemu_cond_timedwait_impl(c, m, ms, __FILE__, __LINE__); + qemu_cond_timedwait_impl(c, m, ms, __FILE__, __LINE__) #else #define qemu_mutex_lock(m) ({ \ QemuMutexLockFunc _f =3D atomic_read(&qemu_mutex_lock_func); \ --=20 2.20.1