From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 197D2C2D0A8 for ; Wed, 23 Sep 2020 12:48:42 +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 5647A2137B for ; Wed, 23 Sep 2020 12:48:41 +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="Cpvl6VmD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5647A2137B 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL4CO-0004J9-9c for qemu-devel@archiver.kernel.org; Wed, 23 Sep 2020 08:48:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL47y-0000HO-7Y for qemu-devel@nongnu.org; Wed, 23 Sep 2020 08:44:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL47v-00075K-Ei for qemu-devel@nongnu.org; Wed, 23 Sep 2020 08:44:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600865042; 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:autocrypt:autocrypt; bh=hw9WEGmGNUu+WgfdFN4EiriFZiOAvFF3KJ16jHLwMEw=; b=Cpvl6VmDQ4YTo/boVsMe10pMhrtv2bVv4MzvD1x6wPZ2/anwFwI33XVXaPzMWCJl9Ms4L0 8TvLc9zwlWabXQAsHD8XI5IDjrOY2Yh9z8d2pvkS6xrVn1rkg3YcZSXjeXupeZyfBjS+GZ /UmyvPYVFzn80z99sJecVrI52JDVO3U= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-556-jN_zT_x_ONW41hAbL5zEXg-1; Wed, 23 Sep 2020 08:43:59 -0400 X-MC-Unique: jN_zT_x_ONW41hAbL5zEXg-1 Received: by mail-wr1-f71.google.com with SMTP id 33so8741901wrk.12 for ; Wed, 23 Sep 2020 05:43:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=hw9WEGmGNUu+WgfdFN4EiriFZiOAvFF3KJ16jHLwMEw=; b=Dz1Y7oIicqUBMVDYRoj9JsP8GgLF3qt7DjjKyn0SzslYDw4IBH7zgUcHmpkJXB3GNe HrGG4xZJxJb0qzj5lPNae3NoTxL0fx8/NjBzVvyjiIPx+By2Rn9v/UwpUKyUFMxuLcSo GrxV0dUVgf0eOtGESeFlmse5XBamlP10gWW7eZ7/P3OaBooNyTMlpGV24clt0LMxhxHg Jw6DLY6N0c7tkJzkaaGky8Yn/kupTeJDn4ga2efzxlbrmoaL3b+sjd3jCrrSp98kMuDY k9se+UINFKFOw4R7DTvdcJCDMzJH4WjxXpIJNFxAyp4xDCI4zCbPctCamu4uWn33FJtS 5arQ== X-Gm-Message-State: AOAM530KOPORwdY3C/imqOg/7kG3uhAgL2zHT3tgy6zISU/yM0fuqkiM AB/zBTq5BCVYIK3unY4EM0M/XUtOUbf3vBUaeRkAXP/fO7VUt30AW364hKGoxhm20+XK4k42lpf 3kvZzRvma2c9Jc0o= X-Received: by 2002:a5d:494b:: with SMTP id r11mr625030wrs.227.1600865037819; Wed, 23 Sep 2020 05:43:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUhlvPeZCm3s3Zwa1yYE4gK+p3VCRndlrGF5QI1S9+YaLxw/1WRoCabWLmJZqZhI5emtTUAg== X-Received: by 2002:a5d:494b:: with SMTP id r11mr624965wrs.227.1600865037566; Wed, 23 Sep 2020 05:43:57 -0700 (PDT) Received: from [192.168.1.36] (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id a81sm8810100wmf.32.2020.09.23.05.43.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Sep 2020 05:43:56 -0700 (PDT) Subject: Re: [PATCH v3] qemu/atomic.h: rename atomic_ to qatomic_ To: Stefan Hajnoczi , qemu-devel@nongnu.org References: <20200923105646.47864-1-stefanha@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Autocrypt: addr=philmd@redhat.com; keydata= mQINBDXML8YBEADXCtUkDBKQvNsQA7sDpw6YLE/1tKHwm24A1au9Hfy/OFmkpzo+MD+dYc+7 bvnqWAeGweq2SDq8zbzFZ1gJBd6+e5v1a/UrTxvwBk51yEkadrpRbi+r2bDpTJwXc/uEtYAB GvsTZMtiQVA4kRID1KCdgLa3zztPLCj5H1VZhqZsiGvXa/nMIlhvacRXdbgllPPJ72cLUkXf z1Zu4AkEKpccZaJspmLWGSzGu6UTZ7UfVeR2Hcc2KI9oZB1qthmZ1+PZyGZ/Dy+z+zklC0xl XIpQPmnfy9+/1hj1LzJ+pe3HzEodtlVA+rdttSvA6nmHKIt8Ul6b/h1DFTmUT1lN1WbAGxmg CH1O26cz5nTrzdjoqC/b8PpZiT0kO5MKKgiu5S4PRIxW2+RA4H9nq7nztNZ1Y39bDpzwE5Sp bDHzd5owmLxMLZAINtCtQuRbSOcMjZlg4zohA9TQP9krGIk+qTR+H4CV22sWldSkVtsoTaA2 qNeSJhfHQY0TyQvFbqRsSNIe2gTDzzEQ8itsmdHHE/yzhcCVvlUzXhAT6pIN0OT+cdsTTfif MIcDboys92auTuJ7U+4jWF1+WUaJ8gDL69ThAsu7mGDBbm80P3vvUZ4fQM14NkxOnuGRrJxO qjWNJ2ZUxgyHAh5TCxMLKWZoL5hpnvx3dF3Ti9HW2dsUUWICSQARAQABtDJQaGlsaXBwZSBN YXRoaWV1LURhdWTDqSAoUGhpbCkgPHBoaWxtZEByZWRoYXQuY29tPokCVQQTAQgAPwIbDwYL CQgHAwIGFQgCCQoLBBYCAwECHgECF4AWIQSJweePYB7obIZ0lcuio/1u3q3A3gUCXsfWwAUJ KtymWgAKCRCio/1u3q3A3ircD/9Vjh3aFNJ3uF3hddeoFg1H038wZr/xi8/rX27M1Vj2j9VH 0B8Olp4KUQw/hyO6kUxqkoojmzRpmzvlpZ0cUiZJo2bQIWnvScyHxFCv33kHe+YEIqoJlaQc JfKYlbCoubz+02E2A6bFD9+BvCY0LBbEj5POwyKGiDMjHKCGuzSuDRbCn0Mz4kCa7nFMF5Jv piC+JemRdiBd6102ThqgIsyGEBXuf1sy0QIVyXgaqr9O2b/0VoXpQId7yY7OJuYYxs7kQoXI 6WzSMpmuXGkmfxOgbc/L6YbzB0JOriX0iRClxu4dEUg8Bs2pNnr6huY2Ft+qb41RzCJvvMyu gS32LfN0bTZ6Qm2A8ayMtUQgnwZDSO23OKgQWZVglGliY3ezHZ6lVwC24Vjkmq/2yBSLakZE 6DZUjZzCW1nvtRK05ebyK6tofRsx8xB8pL/kcBb9nCuh70aLR+5cmE41X4O+MVJbwfP5s/RW 9BFSL3qgXuXso/3XuWTQjJJGgKhB6xXjMmb1J4q/h5IuVV4juv1Fem9sfmyrh+Wi5V1IzKI7 RPJ3KVb937eBgSENk53P0gUorwzUcO+ASEo3Z1cBKkJSPigDbeEjVfXQMzNt0oDRzpQqH2vp apo2jHnidWt8BsckuWZpxcZ9+/9obQ55DyVQHGiTN39hkETy3Emdnz1JVHTU0Q== Message-ID: Date: Wed, 23 Sep 2020 14:43:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200923105646.47864-1-stefanha@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US 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/23 00:53:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -32 X-Spam_score: -3.3 X-Spam_bar: --- X-Spam_report: (-3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.228, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, 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=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: Fam Zheng , Peter Maydell , sheepdog@lists.wpkg.org, kvm@vger.kernel.org, Paul Durrant , Jason Wang , Yuval Shaia , Michael Roth , Max Filippov , Alistair Francis , Gerd Hoffmann , Huacai Chen , Jiri Slaby , Stefano Stabellini , Alberto Garcia , Matthew Rosato , Yoshinori Sato , Juan Quintela , David Hildenbrand , Markus Armbruster , Halil Pasic , Christian Borntraeger , Aleksandar Markovic , Anthony Perard , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Thomas Huth , Eduardo Habkost , Stefan Weil , Peter Lieven , "Dr. David Alan Gilbert" , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Liu Yuan , xen-devel@lists.xenproject.org, Sunil Muthuswamy , John Snow , Palmer Dabbelt , Richard Henderson , Kevin Wolf , qemu-riscv@nongnu.org, qemu-block@nongnu.org, Bastian Koppelmann , Cornelia Huck , Hailiang Zhang , Max Reitz , Sagar Karandikar , "Michael S. Tsirkin" , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 9/23/20 12:56 PM, Stefan Hajnoczi wrote: > clang's C11 atomic_fetch_*() functions only take a C11 atomic type > pointer argument. QEMU uses direct types (int, etc) and this causes a > compiler error when a QEMU code calls these functions in a source file > that also included via a system header file: > > $ CC=clang CXX=clang++ ./configure ... && make > ../util/async.c:79:17: error: address argument to atomic operation must be a pointer to _Atomic type ('unsigned int *' invalid) > > Avoid using atomic_*() names in QEMU's atomic.h since that namespace is > used by . Prefix QEMU's APIs with 'q' so that atomic.h > and can co-exist. I checked /usr/include on my machine and > searched GitHub for existing "qatomic_" users but there seem to be none. > > This patch was generated using: > > $ git grep -h -o '\ sort -u >/tmp/changed_identifiers > $ for identifier in $( sed -i "s%\<$identifier\>%q$identifier%g" \ > $(git grep -I -l "\<$identifier\>") > done > > I manually fixed line-wrap issues and misaligned rST tables. > > Signed-off-by: Stefan Hajnoczi Reviewed using 'git-diff --color-words'. Reviewed-by: Philippe Mathieu-Daudé > --- > v3: > * Use qatomic_ instead of atomic_ [Paolo] > * The diff of my manual fixups is available here: > https://vmsplice.net/~stefan/atomic-namespace-pre-fixups-v3.diff > - Dropping #ifndef qatomic_fetch_add in atomic.h > - atomic_##X(haddr, val) glue macros not caught by grep > - Keep atomic_add-bench name > - C preprocessor backslash-newline ('\') column alignment > - Line wrapping > v2: > * The diff of my manual fixups is available here: > https://vmsplice.net/~stefan/atomic-namespace-pre-fixups.diff > - Dropping #ifndef qemu_atomic_fetch_add in atomic.h > - atomic_##X(haddr, val) glue macros not caught by grep > - Keep atomic_add-bench name > - C preprocessor backslash-newline ('\') column alignment > - Line wrapping > * Use grep -I to avoid accidentally modifying binary files (RISC-V > OpenSBI ELFs) [Eric Blake] > * Tweak .gitorder to show atomic.h changes first [Eric Blake] > * Update grep commands in commit description so reviewers can reproduce > mechanical changes [Eric Blake] > ---