mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-24 03:13:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up a few header guard symbols

Browse Source 
Commit 58ea30f514 "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 a8b991b52d "Clean up ill-advised or unusual header guards"
missed include/hw/xen/io/ring.h for the same reason.

Commit 3979fca4b6 "disas: Rename include/disas/bfd.h back to
include/disas/dis-asm.h" neglected to update the guard symbol for the
rename.

Commit a331c6d774 "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>
This commit is contained in:
Markus Armbruster 2019-06-04 20:16:17 +02:00
parent c0a9956b32
commit 37677d7db3
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/elf2dmp/qemu_elf.h
View File

@ -2,11 +2,10 @@
* Copyright (c) 2018 Virtuozzo International GmbH
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
*
*/
#ifndef EMPF2DMP_QEMU_ELF_H
#define EMPF2DMP_QEMU_ELF_H
#ifndef ELF2DMP_QEMU_ELF_H
#define ELF2DMP_QEMU_ELF_H
#include "elf.h"

6
include/disas/dis-asm.h
View File

@ -6,8 +6,8 @@
interface, for making instruction-processing programs more independent
of the instruction set being processed. */
#ifndef DISAS_BFD_H
#define DISAS_BFD_H
#ifndef DISAS_DIS_ASM_H
#define DISAS_DIS_ASM_H
typedef void *PTR;
typedef uint64_t bfd_vma;
@ -508,4 +508,4 @@ bfd_vma bfd_getl16 (const bfd_byte *addr);
bfd_vma bfd_getb16 (const bfd_byte *addr);
typedef bool bfd_boolean;
#endif /* DISAS_BFD_H */
#endif /* DISAS_DIS_ASM_H */

6
include/hw/semihosting/console.h
View File

@ -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 */

6
include/hw/xen/io/ring.h
View File

@ -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:

6
target/cris/opcode-cris.h
View File

@ -19,8 +19,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifndef __CRIS_H_INCLUDED_
#define __CRIS_H_INCLUDED_
#ifndef TARGET_CRIS_OPCODE_CRIS_H
#define TARGET_CRIS_OPCODE_CRIS_H
#if !defined(__STDC__) && !defined(const)
#define const
@ -345,7 +345,7 @@ extern const struct cris_opcode cris_opcodes[];
sign-extended before adding to "target". */
#define CRIS_DIS_FLAG_MEM_TARGET2_MEM_WORD (1 << 7)
#endif /* __CRIS_H_INCLUDED_ */
#endif /* TARGET_CRIS_OPCODE_CRIS_H */
/*
* Local variables:

2
tests/migration/migration-test.h
View File

@ -32,4 +32,4 @@
*/
#define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024)
#endif /* _MIGRATION_TEST_H */
#endif /* MIGRATION_TEST_H */

6
tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
View File

@ -21,8 +21,8 @@
WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#ifndef __BIOS_TABLES_TEST_H__
#define __BIOS_TABLES_TEST_H__
#ifndef BIOSTABLESTEST_H
#define BIOSTABLESTEST_H
#include <Uefi/UefiBaseType.h>
@ -77,4 +77,4 @@ typedef struct {
} BIOS_TABLES_TEST;
#pragma pack ()
#endif // __BIOS_TABLES_TEST_H__
#endif /* BIOSTABLESTEST_H */