Commit 37677d7d authored by Markus Armbruster's avatar Markus Armbruster
Browse files

Clean up a few header guard symbols 



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

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

Commit a331c6d7 "semihosting: implement a semihosting console"
created include/hw/semihosting/console.h with an ill-advised guard
symbol.

Clean them up.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190604181618.19980-4-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent c0a9956b

contrib/elf2dmp/qemu_elf.h

+2 −3
Original line number Diff line number Diff line
@@ -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"

include/disas/dis-asm.h

+3 −3
Original line number Diff line number Diff line
@@ -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 */

include/hw/semihosting/console.h

+3 −3
Original line number Diff line number Diff line
@@ -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 */

include/hw/xen/io/ring.h

+3 −3
Original line number Diff line number Diff line
@@ -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:

target/cris/opcode-cris.h

+3 −3
Original line number Diff line number Diff line
@@ -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: