1. Patchew
  2. QEMU
  3. [PATCH 0/5] Clean up header guards again
  4. View patch

[PATCH 4/5] Normalize header guard symbol definition

Markus Armbruster posted 5 patches 2 weeks, 4 days ago
Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Stefan Berger <stefanb@linux.vnet.ibm.com>, Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, "Daniel P. Berrangé" <berrange@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Eduardo Habkost <eduardo@habkost.net>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, Jason Wang <jasowang@redhat.com>, Sriram Yagnaraman <sriram.yagnaraman@ericsson.com>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, "Alex Bennée" <alex.bennee@linaro.org>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Samuel Tardieu <sam@rfc1149.net>, Gerd Hoffmann <kraxel@redhat.com>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Ninad Palsule <ninad@linux.ibm.com>, "Cédric Le Goater" <clg@kaod.org>, Song Gao <gaosong@loongson.cn>, Bibo Mao <maobibo@loongson.cn>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Beniamino Galvani <b.galvani@gmail.com>, Strahinja Jankovic <strahinja.p.jankovic@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Francisco Iglesias <francisco.iglesias@amd.com>, Vikram Garhwal <vikram.garhwal@bytedance.com>, Bernhard Beschow <shentey@gmail.com>, Nicholas Piggin <npiggin@gmail.com>, Aditya Gupta <adityag@linux.ibm.com>, Glenn Miles <milesg@linux.ibm.com>, Stefano Garzarella <sgarzare@redhat.com>, Viresh Kumar <viresh.kumar@linaro.org>, Stefano Stabellini <sstabellini@kernel.org>, Anthony PERARD <anthony@xenproject.org>, Paul Durrant <paul@xen.org>, Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Hyman Huang <yong.huang@smartx.com>, Peter Xu <peterx@redhat.com>, Riku Voipio <riku.voipio@iki.fi>, Kostiantyn Kostiuk <kkostiuk@redhat.com>, Alessandro Di Federico <ale@rev.ng>, Anton Johansson <anjo@rev.ng>, Zhao Liu <zhao1.liu@intel.com>, Cameron Esfahani <dirty@apple.com>, Roman Bolshakov <rbolshakov@ddn.com>, Phil Dennis-Jordan <phil@philjordan.eu>, Wei Liu <wei.liu@kernel.org>, David Woodhouse <dwmw2@infradead.org>, Marcelo Tosatti <mtosatti@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Max Filippov <jcmvbkbc@gmail.com>
[PATCH 4/5] Normalize header guard symbol definition
Posted by Markus Armbruster 2 weeks, 4 days ago 
We commonly define the header guard symbol without an explicit value.
Normalize the exceptions.

Done with scripts/clean-header-guards.pl.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 include/exec/tlb-common.h     | 3 ++-
 include/hw/misc/xlnx-cfi-if.h | 3 ++-
 include/qemu/mem-reentrancy.h | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/exec/tlb-common.h b/include/exec/tlb-common.h
index 03b5a8ffc7..1bfc278d69 100644
--- a/include/exec/tlb-common.h
+++ b/include/exec/tlb-common.h
@@ -16,8 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef EXEC_TLB_COMMON_H
-#define EXEC_TLB_COMMON_H 1
+#define EXEC_TLB_COMMON_H
 
 #define CPU_TLB_ENTRY_BITS (HOST_LONG_BITS == 32 ? 4 : 5)
 
diff --git a/include/hw/misc/xlnx-cfi-if.h b/include/hw/misc/xlnx-cfi-if.h
index 5010401517..b1012beb4d 100644
--- a/include/hw/misc/xlnx-cfi-if.h
+++ b/include/hw/misc/xlnx-cfi-if.h
@@ -7,8 +7,9 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+
 #ifndef XLNX_CFI_IF_H
-#define XLNX_CFI_IF_H 1
+#define XLNX_CFI_IF_H
 
 #include "qemu/help-texts.h"
 #include "qom/object.h"
diff --git a/include/qemu/mem-reentrancy.h b/include/qemu/mem-reentrancy.h
index 07cafd4717..86e377c0c0 100644
--- a/include/qemu/mem-reentrancy.h
+++ b/include/qemu/mem-reentrancy.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #ifndef QEMU_MEM_REENTRANCY_H
-#define QEMU_MEM_REENTRANCY_H 1
+#define QEMU_MEM_REENTRANCY_H
 
 typedef struct MemReentrancyGuard {
     bool engaged_in_io;
-- 
2.52.0
Re: [PATCH 4/5] Normalize header guard symbol definition
Posted by Daniel P. Berrangé 2 weeks, 4 days ago 
On Mon, Jan 19, 2026 at 11:05:36AM +0100, Markus Armbruster wrote:
> We commonly define the header guard symbol without an explicit value.
> Normalize the exceptions.
> 
> Done with scripts/clean-header-guards.pl.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  include/exec/tlb-common.h     | 3 ++-
>  include/hw/misc/xlnx-cfi-if.h | 3 ++-
>  include/qemu/mem-reentrancy.h | 2 +-
>  3 files changed, 5 insertions(+), 3 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.