From 9ae2fc4d9e05ad2ef7987f384aec2c0641221a55 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Sun, 25 Feb 2018 04:18:40 -0500
Subject: [PATCH] Clean up header guards that don't match their file name

Header guard symbols should match their file name to make guard
collisions less likely. Offenders found with
scripts/clean-header-guards.pl -vn.

Cleaned up with scripts/clean-header-guards.pl, followed by some
renaming of new guard symbols picked by the script to better ones.

Backports commit 121d07125bb6d7079c7ebafdd3efe8c3a01cc440 from qemu
---
 qemu/include/exec/address-spaces.h | 4 ++--
 qemu/include/exec/helper-head.h    | 6 +++---
 qemu/include/hw/arm/arm.h          | 6 +++---
 qemu/include/qapi/qmp/types.h      | 6 +++---
 qemu/include/qapi/visitor.h        | 5 +++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/qemu/include/exec/address-spaces.h b/qemu/include/exec/address-spaces.h
index 58e825a6..8b603141 100644
--- a/qemu/include/exec/address-spaces.h
+++ b/qemu/include/exec/address-spaces.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef EXEC_MEMORY_H
-#define EXEC_MEMORY_H
+#ifndef EXEC_ADDRESS_SPACES_H
+#define EXEC_ADDRESS_SPACES_H
 
 /*
  * Internal interfaces between memory.c/exec.c/vl.c.  Do not #include unless
diff --git a/qemu/include/exec/helper-head.h b/qemu/include/exec/helper-head.h
index b009ccb1..04219d1d 100644
--- a/qemu/include/exec/helper-head.h
+++ b/qemu/include/exec/helper-head.h
@@ -15,8 +15,8 @@
     GEN_HELPER 2 to do runtime registration helper functions.
  */
 
-#ifndef DEF_HELPER_H
-#define DEF_HELPER_H 1
+#ifndef EXEC_HELPER_HEAD_H
+#define EXEC_HELPER_HEAD_H
 
 #include "qemu/osdep.h"
 
@@ -131,4 +131,4 @@
 
 /* MAX_OPC_PARAM_IARGS must be set to n if last entry is DEF_HELPER_FLAGS_n. */
 
-#endif /* DEF_HELPER_H */
+#endif /* EXEC_HELPER_HEAD_H */
diff --git a/qemu/include/hw/arm/arm.h b/qemu/include/hw/arm/arm.h
index eab2de1c..627fa67b 100644
--- a/qemu/include/hw/arm/arm.h
+++ b/qemu/include/hw/arm/arm.h
@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef ARM_MISC_H
-#define ARM_MISC_H
+#ifndef HW_ARM_H
+#define HW_ARM_H
 
 #include "exec/memory.h"
 #include "target-arm/cpu-qom.h"
@@ -20,4 +20,4 @@ void machvirt_machine_init(struct uc_struct *uc);   // ARM64
 void arm_cpu_register_types(void *opaque);
 void aarch64_cpu_register_types(void *opaque);
 
-#endif /* !ARM_MISC_H */
+#endif /* HW_ARM_H */
diff --git a/qemu/include/qapi/qmp/types.h b/qemu/include/qapi/qmp/types.h
index 7782ec5a..82de0616 100644
--- a/qemu/include/qapi/qmp/types.h
+++ b/qemu/include/qapi/qmp/types.h
@@ -10,8 +10,8 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
-#ifndef QEMU_OBJECTS_H
-#define QEMU_OBJECTS_H
+#ifndef QAPI_QMP_TYPES_H
+#define QAPI_QMP_TYPES_H
 
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qint.h"
@@ -22,4 +22,4 @@
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qjson.h"
 
-#endif /* QEMU_OBJECTS_H */
+#endif /* QAPI_QMP_TYPES_H */
diff --git a/qemu/include/qapi/visitor.h b/qemu/include/qapi/visitor.h
index ee4ed6ed..51c2d05a 100644
--- a/qemu/include/qapi/visitor.h
+++ b/qemu/include/qapi/visitor.h
@@ -10,8 +10,9 @@
  * See the COPYING.LIB file in the top-level directory.
  *
  */
-#ifndef QAPI_VISITOR_CORE_H
-#define QAPI_VISITOR_CORE_H
+
+#ifndef QAPI_VISITOR_H
+#define QAPI_VISITOR_H
 
 #include "qemu/typedefs.h"
 #include "qapi/qmp/qobject.h"