aboutsummaryrefslogtreecommitdiff
path: root/include/hw
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-06-04 20:16:17 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-06-12 13:20:20 +0200
commit37677d7db39a3c250ad661d00fb7c3b59d047b1f (patch)
tree1bfb6bdd55d1aa3adebb4e34a5cd219a3fbde684 /include/hw
parentc0a9956b32e2806a9d50ce8c651ace140f5f79f1 (diff)
downloadqemu-37677d7db39a3c250ad661d00fb7c3b59d047b1f.zip
qemu-37677d7db39a3c250ad661d00fb7c3b59d047b1f.tar.gz
qemu-37677d7db39a3c250ad661d00fb7c3b59d047b1f.tar.bz2
Clean up a few header guard symbols
Commit 58ea30f5145 "Clean up header guards that don't match their file name" messed up contrib/elf2dmp/qemu_elf.h and tests/migration/migration-test.h. It missed target/cris/opcode-cris.h and tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h due to the scripts/clean-header-guards.pl bug fixed in the previous commit. Commit a8b991b52dc "Clean up ill-advised or unusual header guards" missed include/hw/xen/io/ring.h for the same reason. Commit 3979fca4b69 "disas: Rename include/disas/bfd.h back to include/disas/dis-asm.h" neglected to update the guard symbol for the rename. Commit a331c6d7741 "semihosting: implement a semihosting console" created include/hw/semihosting/console.h with an ill-advised guard symbol. Clean them up. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190604181618.19980-4-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'include/hw')
-rw-r--r--include/hw/semihosting/console.h6
-rw-r--r--include/hw/xen/io/ring.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/include/hw/semihosting/console.h b/include/hw/semihosting/console.h
index 30e66ae..9eb45b7 100644
--- a/include/hw/semihosting/console.h
+++ b/include/hw/semihosting/console.h
@@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef _SEMIHOST_CONSOLE_H_
-#define _SEMIHOST_CONSOLE_H_
+#ifndef SEMIHOST_CONSOLE_H
+#define SEMIHOST_CONSOLE_H
/**
* qemu_semihosting_console_out:
@@ -35,4 +35,4 @@ int qemu_semihosting_console_out(CPUArchState *env, target_ulong s, int len);
*/
int qemu_semihosting_log_out(const char *s, int len);
-#endif /* _SEMIHOST_CONSOLE_H_ */
+#endif /* SEMIHOST_CONSOLE_H */
diff --git a/include/hw/xen/io/ring.h b/include/hw/xen/io/ring.h
index 1adacf0..62abfd7 100644
--- a/include/hw/xen/io/ring.h
+++ b/include/hw/xen/io/ring.h
@@ -24,8 +24,8 @@
* Tim Deegan and Andrew Warfield November 2004.
*/
-#ifndef __XEN_PUBLIC_IO_RING_H__
-#define __XEN_PUBLIC_IO_RING_H__
+#ifndef XEN_PUBLIC_IO_RING_H
+#define XEN_PUBLIC_IO_RING_H
/*
* When #include'ing this header, you need to provide the following
@@ -469,7 +469,7 @@ struct name##_data_intf { \
}; \
DEFINE_XEN_FLEX_RING(name)
-#endif /* __XEN_PUBLIC_IO_RING_H__ */
+#endif /* XEN_PUBLIC_IO_RING_H */
/*
* Local variables: