From nobody Sun Feb 8 18:30:11 2026 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=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1584707631; cv=none; d=zohomail.com; s=zohoarc; b=Ygxse/3IP2olC8ubGRCq25Sw+4BUZJmF2uX0/0IzjWycnkl/o8XamUXYfX2IX6M6dIkmW4TZf5ltr/GI0fZy0Sul15+Xok15JyLV99Kw647cDB41/qko4JJnTxZxdOi6i9Qm4ajYaaEu8KjsNPZKH1L6ozEK5UcifTSdxkZZm00= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584707631; h=Content-Transfer-Encoding:Cc: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=DFZU6y1FUNjWETl8iut0I7iFRsUd4Hl2jMI8hhwl6Dk=; b=g6i+jndlUDDCbw3jJ2XFSaaQWrrbkvfSWGoBIWjpFrJtn2v2j9RWSa/Iz2J095kUsx6NcCgwcqZWNVdsSqHyGuYnZ+zkrIM/qbC5uxhTs/nyqkviDtO8pM57dOlIK3ZRnI6qmmV5uDMPzOH3OgMFn/lRP1EIWaorwlm7YOWJJM8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1584707631021146.80390392523964; Fri, 20 Mar 2020 05:33:51 -0700 (PDT) Received: from localhost ([::1]:52298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFGqR-00042Q-4D for importer@patchew.org; Fri, 20 Mar 2020 08:33:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59545) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFGoh-0002Wo-8W for qemu-devel@nongnu.org; Fri, 20 Mar 2020 08:32:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFGog-0000cg-9x for qemu-devel@nongnu.org; Fri, 20 Mar 2020 08:31:59 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:37340) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jFGog-0000cO-4c for qemu-devel@nongnu.org; Fri, 20 Mar 2020 08:31:58 -0400 Received: by mail-pf1-x434.google.com with SMTP id h72so940481pfe.4 for ; Fri, 20 Mar 2020 05:31:58 -0700 (PDT) Received: from esc.telus (node-1w7jr9qmilj27lake3duljaz9.ipv6.telus.net. [2001:569:75e3:4100:12ba:ab1b:8ad3:bb55]) by smtp.gmail.com with ESMTPSA id 1sm4766550pjo.10.2020.03.20.05.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 05:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DFZU6y1FUNjWETl8iut0I7iFRsUd4Hl2jMI8hhwl6Dk=; b=BF0QR8BNJf7jCMvjwD2Hb75duT2OBpKxIE03GwIVDIe9dU/Vhvq0iayysCCNXKWOun NjQq0NaP/EsyWwJxTJ3FMem2wxJwdxqRziSI/a8Rku0Ciauqw4wWo4RSlYRwgU7VNvTC ESYP15AIzwhc23TI23FCBDCG7dymakibVqcZCG9GbFLWuN0X/QBCpizFHJBOxGhyLIT/ 6dFIrCDBat7Y5APtX6QevIGcAH/NO+E3Q+xn/yn7IZQ5gZUzmS9vt7QVRBsk71y/Tt35 fL21IwCAWxu1YvqAWbRuJxKi70bXKzd0zNW2nmrnpHEaLCan8oU9E0a1W6qBTZQxodDV 2baw== 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=DFZU6y1FUNjWETl8iut0I7iFRsUd4Hl2jMI8hhwl6Dk=; b=prD/oEUAmcvwJQmz0UkND9SEGoftorOQ31U0OuXzTBZPKvvCyK2Dhmna4accBnQyb/ HUucOAzMMmWckg42PaTnQiUnODRIpMM7n/HvfPsqyhqPh/X1pwLIS4Fsci/PcaAs0yMd n17Y0FMnK5r+85iHWKIUFCAF8y6Ly2UgrEDbX7VEb0z3ZQvqpWQhdFXF8pj68Gte7CQj CbcXt3OItO68t0oqqp2N2cbeLrPGTWr/UIp06i2VLo4bZfBTMhy5H3O4LuBa1j2jX2U+ yrNhVvg+2aWnv2KZVAxNBl4haw9CynwC42Yee0l3AxUJcoe+GOIpa/kBvePLf4e3gWNT Meag== X-Gm-Message-State: ANhLgQ35DT3zqbXlsNN59dLLudqLuaMVjrYHTcQUtNimQaJiCj+l6FvJ NaWUGlN6VFEgWFhpmOYL3gjU1PzlmSPZfw== X-Google-Smtp-Source: ADFU+vs+69zZJRKphVeb4MDXoIl+XNoC0Q5QxOT3IEUjBs4XCa6pFJHpnhQTnqJjxD1quHWgpMW/cg== X-Received: by 2002:aa7:87ca:: with SMTP id i10mr9452119pfo.169.1584707517179; Fri, 20 Mar 2020 05:31:57 -0700 (PDT) From: dnbrdsky@gmail.com To: dnbrdsky@gmail.com Subject: [PATCH v4 1/2] lockable: fix __COUNTER__ macro to be referenced properly Date: Fri, 20 Mar 2020 05:31:36 -0700 Message-Id: <20200320123137.1937091-2-dnbrdsky@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320123137.1937091-1-dnbrdsky@gmail.com> References: <20200320123137.1937091-1-dnbrdsky@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::434 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: stefanha@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Daniel Brodsky - __COUNTER__ doesn't work with ## concat - replaced ## with glue() macro so __COUNTER__ is evaluated Fixes: 3284c3ddc4 Signed-off-by: Daniel Brodsky --- include/qemu/lockable.h | 4 ++-- include/qemu/rcu.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/qemu/lockable.h b/include/qemu/lockable.h index 1aeb2cb1a6..71cda060e4 100644 --- a/include/qemu/lockable.h +++ b/include/qemu/lockable.h @@ -152,7 +152,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockab= le_auto_unlock) * } */ #define WITH_QEMU_LOCK_GUARD(x) \ - WITH_QEMU_LOCK_GUARD_((x), qemu_lockable_auto##__COUNTER__) + WITH_QEMU_LOCK_GUARD_((x), glue(qemu_lockable_auto, __COUNTER__)) =20 /** * QEMU_LOCK_GUARD - Lock an object until the end of the scope @@ -170,7 +170,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockab= le_auto_unlock) * } */ #define QEMU_LOCK_GUARD(x) \ - g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ =3D \ + g_autoptr(QemuLockable) glue(qemu_lockable_auto, __COUNTER__) =3D \ qemu_lockable_auto_lock(QEMU_MAKE_LOCKABLE((x))) =20 #endif diff --git a/include/qemu/rcu.h b/include/qemu/rcu.h index 9c82683e37..570aa603eb 100644 --- a/include/qemu/rcu.h +++ b/include/qemu/rcu.h @@ -170,7 +170,7 @@ static inline void rcu_read_auto_unlock(RCUReadAuto *r) G_DEFINE_AUTOPTR_CLEANUP_FUNC(RCUReadAuto, rcu_read_auto_unlock) =20 #define WITH_RCU_READ_LOCK_GUARD() \ - WITH_RCU_READ_LOCK_GUARD_(_rcu_read_auto##__COUNTER__) + WITH_RCU_READ_LOCK_GUARD_(glue(_rcu_read_auto, __COUNTER__)) =20 #define WITH_RCU_READ_LOCK_GUARD_(var) \ for (g_autoptr(RCUReadAuto) var =3D rcu_read_auto_lock(); \ --=20 2.25.1