From patchwork Thu Mar 19 16:19:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Brodsky X-Patchwork-Id: 1258355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qEZLO5R9; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48jvYy2QnBz9sRf for ; Fri, 20 Mar 2020 04:49:58 +1100 (AEDT) Received: from localhost ([::1]:41272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEzIo-0001vf-U3 for incoming@patchwork.ozlabs.org; Thu, 19 Mar 2020 13:49:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47144) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jExtR-0000UQ-Sw for qemu-devel@nongnu.org; Thu, 19 Mar 2020 12:19:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jExtQ-0004BL-RO for qemu-devel@nongnu.org; Thu, 19 Mar 2020 12:19:37 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:37255) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jExtQ-0004B9-Jo for qemu-devel@nongnu.org; Thu, 19 Mar 2020 12:19:36 -0400 Received: by mail-pg1-x541.google.com with SMTP id a32so1531221pga.4 for ; Thu, 19 Mar 2020 09:19:36 -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:mime-version :content-transfer-encoding; bh=BAEUxQ7rRU51jZ5YssMQdXfJ3giCUEq60r8fzA4c57c=; b=qEZLO5R9IxxBbHOmkv6IxvzqHrVXDwmKXH/l1b3lR89OWH6TsTUm2833xCNhL84wlk nsMmBVGYFibRwzftK/JZrxiKunc7FPh0guRKPlHr6+taFStGzoYmk/h0kogT3Z0zA7me OW4Qxo5kJQnXBG4jMtP7yI4s50MtqFDdPn0xow7FNdn/p1lxTjucghyhubdX7kONQfH9 SqV1l2TAYSsKwBHOenGa1Y0E48J6EKDNHcyN8WG4AJPlD9QKPLxK+xqJFmlzw6BFEDyF 7/FSZeP11C5RqA0Zx5Pdcvm19MMp3SJwY3hB4IW3UGbFWdk9Hg4K0ZH5RsGktL+YrQ35 aSSQ== 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:mime-version :content-transfer-encoding; bh=BAEUxQ7rRU51jZ5YssMQdXfJ3giCUEq60r8fzA4c57c=; b=H4gMm+y5RB2Tnz+kWzlXnkXkO1Qg3Hs4FoeDk2hzSgvYQHDxf+m/UY3vR6pez6Zkvc tHaVCEYX3c8DeHS+h1FCGWXgio6xefY6hcpLICP+GS51T3EzsF5IypZRRv3cIizByaY0 pfJkpdcM95AoKmIsKsPHWjbTuIMFX2CS4ewrkXNjlCEBRD9fHE1On0dN1bCwdrhcDTpG f9DMMsL8XOlYXgxna4x/efNduGnWSjAsFVRK/B8oHpT1G/E3X0fG7/2x5dnx/4MNVWyr oCuG1N6sCdMMcuSrqodj7b5eU8iQYa8mb91oOOFKxKUbLf2Lf5tSYut1sjUBxksVsp7Z PPmg== X-Gm-Message-State: ANhLgQ3GpRwlRNurFrapl777SClxulouH6Z/HwZancyGKWlk5CKitaEm +TUSelK2PO44+guSNLkyaw3+9W9KbacZwg== X-Google-Smtp-Source: ADFU+vtFieKyGNJ9KqnN3EoCxQgsVBEmvfaOunccLZ1q8zCqOqETx65ETyKQrf42+chQDK1+tHk1iw== X-Received: by 2002:a62:fc07:: with SMTP id e7mr4906771pfh.299.1584634775181; Thu, 19 Mar 2020 09:19:35 -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 e9sm2978894pfl.179.2020.03.19.09.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2020 09:19:34 -0700 (PDT) From: dnbrdsky@gmail.com To: stefanha@gmail.com Subject: [PATCH] misc: fix __COUNTER__ macro to be referenced properly Date: Thu, 19 Mar 2020 09:19:24 -0700 Message-Id: <20200319161925.1818377-1-dnbrdsky@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 X-Mailman-Approved-At: Thu, 19 Mar 2020 13:49:29 -0400 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: danbrodsky , "open list:All patches CC here" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: danbrodsky - __COUNTER__ doesn't work with ## concat - replaced ## with glue() macro so __COUNTER__ is evaluated Signed-off-by: danbrodsky Reviewed-by: Eric Blake --- include/qemu/lockable.h | 2 +- include/qemu/rcu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/qemu/lockable.h b/include/qemu/lockable.h index 1aeb2cb1a6..a9258f2c2c 100644 --- a/include/qemu/lockable.h +++ b/include/qemu/lockable.h @@ -170,7 +170,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockable_auto_unlock) * } */ #define QEMU_LOCK_GUARD(x) \ - g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \ + g_autoptr(QemuLockable) glue(qemu_lockable_auto, __COUNTER__) = \ qemu_lockable_auto_lock(QEMU_MAKE_LOCKABLE((x))) #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) #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__)) #define WITH_RCU_READ_LOCK_GUARD_(var) \ for (g_autoptr(RCUReadAuto) var = rcu_read_auto_lock(); \