Header guards
Subsystems (5)
cover Header guards
Markus Armbruster (4):
Normalize position of header guard scripts/clean-header-guards: Fix handling of trailing comments Clean up a few header guard symbols
Supply missing header guards
contrib/elf2dmp/qemu_elf.h | 5 ++--- crypto/ivgen-essiv.h | 9 ++++----- crypto/ivgen-plain.h | 5 ++--- crypto/ivgen-plain64.h | 9 ++++----- hw/9pfs/xen-9pfs.h | 6 +++++- hw/hppa/hppa_hardware.h | 5 +++++ hw/input/adb-internal.h | 4 ++++ hw/net/e1000e_core.h | 5 +++++ hw/net/e1000x_common.h | 5 +++++ hw/net/vmxnet3_defs.h | 6 +++++- hw/usb/hcd-xhci.h | 5 +++++ hw/usb/quirks.h | 5 +++++ include/disas/dis-asm.h | 6 +++--- include/fpu/softfloat-macros.h | 5 +++++ include/hw/arm/allwinner-a10.h | 4 ++-- include/hw/arm/omap.h | 8 +++++--- include/hw/arm/raspi_platform.h | 5 +++++ include/hw/arm/xlnx-zynqmp.h | 2 +- include/hw/char/cadence_uart.h | 2 +- include/hw/display/xlnx_dp.h | 9 ++++----- include/hw/dma/xlnx-zynq-devcfg.h | 2 +- include/hw/kvm/clock.h | 6 +++++- include/hw/m68k/mcf_fec.h | 5 +++++ include/hw/mips/bios.h | 5 +++++ include/hw/net/cadence_gem.h | 2 +- include/hw/pci-bridge/simba.h | 5 +++++ include/hw/pci/pci_regs.h | 5 +++++ include/hw/qdev-dma.h | 6 ++++++ include/hw/semihosting/console.h | 6 +++--- include/hw/sparc/sparc64.h | 4 ++++ include/hw/timer/xlnx-zynqmp-rtc.h | 5 +++++ include/hw/xen/io/ring.h | 6 +++--- include/ui/spice-display.h | 5 +++++ linux-user/aarch64/syscall_nr.h | 4 ++++ linux-user/aarch64/termbits.h | 5 +++++ linux-user/alpha/syscall_nr.h | 5 +++++ linux-user/alpha/termbits.h | 5 +++++ linux-user/arm/syscall_nr.h | 5 +++++ linux-user/arm/termbits.h | 5 +++++ linux-user/cris/syscall_nr.h | 5 +++++ linux-user/cris/termbits.h | 5 +++++ linux-user/errno_defs.h | 6 ++++++ linux-user/flat.h | 5 +++++ linux-user/hppa/sockbits.h | 5 +++++ linux-user/hppa/syscall_nr.h | 5 +++++ linux-user/hppa/termbits.h | 5 +++++ linux-user/i386/syscall_nr.h | 5 +++++ linux-user/i386/termbits.h | 5 +++++ linux-user/m68k/syscall_nr.h | 5 +++++ linux-user/m68k/termbits.h | 5 +++++ linux-user/microblaze/syscall_nr.h | 5 +++++ linux-user/microblaze/termbits.h | 5 +++++ linux-user/mips/syscall_nr.h | 6 ++++++ linux-user/mips/termbits.h | 5 +++++ linux-user/mips64/syscall_nr.h | 5 +++++ linux-user/nios2/syscall_nr.h | 5 +++++ linux-user/nios2/termbits.h | 5 +++++ linux-user/openrisc/syscall_nr.h | 5 +++++ linux-user/openrisc/termbits.h | 5 +++++ linux-user/ppc/syscall_nr.h | 6 ++++++ linux-user/ppc/termbits.h | 5 +++++ linux-user/riscv/syscall_nr.h | 5 +++++ linux-user/riscv/target_syscall.h | 5 +++++ linux-user/riscv/termbits.h | 5 +++++ linux-user/s390x/syscall_nr.h | 5 +++++ linux-user/s390x/termbits.h | 4 ++++ linux-user/sh4/syscall_nr.h | 5 +++++ linux-user/sh4/termbits.h | 5 +++++ linux-user/socket.h | 5 +++++ linux-user/sparc/syscall_nr.h | 5 +++++ linux-user/sparc/termbits.h | 5 +++++ linux-user/sparc64/syscall_nr.h | 5 +++++ linux-user/sparc64/termbits.h | 5 +++++ linux-user/target_flat.h | 6 ++++++ linux-user/x86_64/syscall_nr.h | 5 +++++ linux-user/x86_64/termbits.h | 5 +++++ linux-user/xtensa/target_flat.h | 8 +++++--- scripts/clean-header-guards.pl | 12 +++++++----- target/cris/crisv10-decode.h | 4 ++++ target/cris/mmu.h | 5 +++++ target/cris/opcode-cris.h | 6 +++--- target/i386/whp-dispatch.h | 7 +++---- target/microblaze/microblaze-decode.h | 4 ++++ target/microblaze/mmu.h | 5 +++++ target/moxie/mmu.h | 5 +++++ target/riscv/cpu_bits.h | 5 +++++ target/riscv/cpu_user.h | 5 +++++ target/riscv/instmap.h | 5 +++++ target/tilegx/spr_def_64.h | 10 +++------- target/tricore/tricore-opcodes.h | 5 +++++ tcg/tcg-gvec-desc.h | 5 +++++ tcg/tcg-op-gvec.h | 5 +++++ tests/crypto-tls-psk-helpers.h | 5 +++++ tests/crypto-tls-x509-helpers.h | 5 +++++ tests/io-channel-helpers.h | 9 ++++----- tests/libqos/virtio-9p.h | 5 +++++ tests/libqos/virtio-balloon.h | 5 +++++ tests/libqos/virtio-blk.h | 5 +++++ tests/libqos/virtio-net.h | 5 +++++ tests/libqos/virtio-rng.h | 5 +++++ tests/libqos/virtio-scsi.h | 5 +++++ tests/libqos/virtio-serial.h | 5 +++++ tests/migration/migration-test.h | 2 +- tests/socket-helpers.h | 6 +++++- .../UefiTestToolsPkg/Include/Guid/BiosTablesTest.h | 6 +++--- 105 files changed, 479 insertions(+), 74 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/4 Normalize position of header guard
This is the common header guard idiom:
/*
* File comment
*/
#ifndef GUARD_SYMBOL_H
#define GUARD_SYMBOL_H
... actual contents ...
#endifA few of our headers have some #include before the guard. target/tilegx/spr_def_64.h has #ifndef __DOXYGEN__ outside the guard. A few more have the #define elsewhere.
Change them to match the common idiom. For spr_def_64.h, that means dropping #ifndef __DOXYGEN__. While there, rename guard symbols to make scripts/clean-header-guards.pl happy.
--- crypto/ivgen-essiv.h | 9 ++++----- crypto/ivgen-plain.h | 5 ++--- crypto/ivgen-plain64.h | 9 ++++----- include/hw/arm/allwinner-a10.h | 4 ++-- include/hw/arm/omap.h | 8 +++++--- include/hw/arm/xlnx-zynqmp.h | 2 +- include/hw/char/cadence_uart.h | 2 +- include/hw/display/xlnx_dp.h | 9 ++++----- include/hw/dma/xlnx-zynq-devcfg.h | 2 +- include/hw/net/cadence_gem.h | 2 +- target/i386/whp-dispatch.h | 7 +++---- target/tilegx/spr_def_64.h | 10 +++------- tests/io-channel-helpers.h | 9 ++++----- 13 files changed, 35 insertions(+), 43 deletions(-)
crypto/ivgen-essiv.h +4 -5
@@ -15,14 +15,13 @@* * 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 QCRYPTO_IVGEN_ESSIV_H +#define QCRYPTO_IVGEN_ESSIV_H +#include "ivgenpriv.h" -#ifndef QCRYPTO_IVGEN_ESSIV_H__ -#define QCRYPTO_IVGEN_ESSIV_H__ -extern struct QCryptoIVGenDriver qcrypto_ivgen_essiv; -#endif /* QCRYPTO_IVGEN_ESSIV_H__ */ +#endif /* QCRYPTO_IVGEN_ESSIV_H */
crypto/ivgen-plain.h +2 -3
@@ -15,14 +15,13 @@* * 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/>. -* */ -#include "ivgenpriv.h" -#ifndef QCRYPTO_IVGEN_PLAIN_H__ #define QCRYPTO_IVGEN_PLAIN_H__ +#include "ivgenpriv.h" +extern struct QCryptoIVGenDriver qcrypto_ivgen_plain;#endif /* QCRYPTO_IVGEN_PLAIN_H__ */
crypto/ivgen-plain64.h +4 -5
@@ -15,14 +15,13 @@* * 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 QCRYPTO_IVGEN_PLAIN64_H +#define QCRYPTO_IVGEN_PLAIN64_H +#include "ivgenpriv.h" -#ifndef QCRYPTO_IVGEN_PLAIN64_H__ -#define QCRYPTO_IVGEN_PLAIN64_H__ -extern struct QCryptoIVGenDriver qcrypto_ivgen_plain64; -#endif /* QCRYPTO_IVGEN_PLAIN64_H__ */ +#endif /* QCRYPTO_IVGEN_PLAIN64_H */
include/hw/arm/allwinner-a10.h +2 -2
@@ -1,4 +1,5 @@ -#ifndef ALLWINNER_H_ +#ifndef HW_ARM_ALLWINNER_A10_H +#define HW_ARM_ALLWINNER_A10_H #include "qemu-common.h" #include "qemu/error-report.h"
@@ -38,5 +39,4 @@ typedef struct AwA10State { MemoryRegion sram_a; } AwA10State; -#define ALLWINNER_H_ #endif
include/hw/arm/omap.h +5 -3
@@ -16,9 +16,11 @@* 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 hw_omap_h + +#ifndef HW_ARM_OMAP_H +#define HW_ARM_OMAP_H +#include "exec/memory.h" -# define hw_omap_h "omap.h"#include "hw/irq.h" #include "hw/input/tsc2xxx.h" #include "target/arm/cpu-qom.h"
@@ -991,4 +993,4 @@ enum {# define OMAP_MPUI_REG_MASK 0x000007ff -#endif /* hw_omap_h */ +#endif
include/hw/arm/xlnx-zynqmp.h +1 -1
@@ -16,6 +16,7 @@*/ #ifndef XLNX_ZYNQMP_H +#define XLNX_ZYNQMP_H #include "qemu-common.h" #include "hw/arm/boot.h"
@@ -114,5 +115,4 @@ typedef struct XlnxZynqMPState { bool has_rpu; } XlnxZynqMPState; -#define XLNX_ZYNQMP_H #endif
include/hw/char/cadence_uart.h +1 -1
@@ -17,6 +17,7 @@*/ #ifndef CADENCE_UART_H +#define CADENCE_UART_H #include "hw/sysbus.h" #include "chardev/char-fe.h"
@@ -66,5 +67,4 @@ static inline DeviceState *cadence_uart_create(hwaddr addr, return dev; } -#define CADENCE_UART_H #endif
include/hw/display/xlnx_dp.h +4 -5
@@ -19,9 +19,11 @@* * 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 XLNX_DP_H +#define XLNX_DP_H +#include "hw/sysbus.h" #include "ui/console.h" #include "hw/misc/auxbus.h"
@@ -33,9 +35,6 @@#include "hw/dma/xlnx_dpdma.h" #include "audio/audio.h" -#ifndef XLNX_DP_H -#define XLNX_DP_H -#define AUD_CHBUF_MAX_DEPTH (32 * KiB)#define MAX_QEMU_BUFFER_SIZE (4 * KiB)
@@ -107,4 +106,4 @@ typedef struct XlnxDPState {#define TYPE_XLNX_DP "xlnx.v-dp"#define XLNX_DP (obj) OBJECT_CHECK(XlnxDPState, (obj), TYPE_XLNX_DP) -#endif /* !XLNX_DP_H */ +#endif
include/hw/dma/xlnx-zynq-devcfg.h +1 -1
@@ -25,6 +25,7 @@*/ #ifndef XLNX_ZYNQ_DEVCFG_H +#define XLNX_ZYNQ_DEVCFG_H #include "hw/register.h" #include "hw/sysbus.h"
@@ -58,5 +59,4 @@ typedef struct XlnxZynqDevcfg { RegisterInfo regs_info[XLNX_ZYNQ_DEVCFG_R_MAX]; } XlnxZynqDevcfg; -#define XLNX_ZYNQ_DEVCFG_H #endif
include/hw/net/cadence_gem.h +1 -1
@@ -23,6 +23,7 @@*/ #ifndef CADENCE_GEM_H +#define CADENCE_GEM_H #define TYPE_CADENCE_GEM "cadence_gem"#define CADENCE_GEM (obj) OBJECT_CHECK(CadenceGEMState, (obj), TYPE_CADENCE_GEM)
@@ -84,5 +85,4 @@ typedef struct CadenceGEMState { bool sar_active[4]; } CadenceGEMState; -#define CADENCE_GEM_H #endif
target/i386/whp-dispatch.h +3 -4
@@ -1,12 +1,11 @@ +#ifndef WHP_DISPATCH_H +#define WHP_DISPATCH_H +#include <windows.h> #include <WinHvPlatform.h> #include <WinHvEmulation.h> -#ifndef WHP_DISPATCH_H -#define WHP_DISPATCH_H - -#define LIST_WINHVPLATFORM_FUNCTIONS (X ) \ X(HRESULT, WHvGetCapability, (WHV_CAPABILITY_CODE CapabilityCode, VOID* CapabilityBuffer, UINT32 CapabilityBufferSizeInBytes, UINT32* WrittenSizeInBytes)) \ X(HRESULT, WHvCreatePartition, (WHV_PARTITION_HANDLE* Partition)) \
target/tilegx/spr_def_64.h +3 -7
@@ -12,10 +12,8 @@* more details. */ -#ifndef __DOXYGEN__ - -#ifndef __ARCH_SPR_DEF_64_H__ -#define __ARCH_SPR_DEF_64_H__ +#ifndef ARCH_SPR_DEF_64_H +#define ARCH_SPR_DEF_64_H #define SPR_AUX_PERF_COUNT_0 0x2105#define SPR_AUX_PERF_COUNT_1 0x2106
@@ -211,6 +209,4 @@#define SPR_WATCH_MASK 0x200a#define SPR_WATCH_VAL 0x200b -#endif /* !defined(__ARCH_SPR_DEF_64_H__) */ - -#endif /* !defined(__DOXYGEN__) */ +#endif
tests/io-channel-helpers.h +4 -5
@@ -15,14 +15,13 @@* * 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 TEST_IO_CHANNEL_HELPERS_H +#define TEST_IO_CHANNEL_HELPERS_H +#include "io/channel.h" -#ifndef TEST_IO_CHANNEL_HELPERS -#define TEST_IO_CHANNEL_HELPERS -typedef struct QIOChannelTest QIOChannelTest ;QIOChannelTest *qio_channel_test_new (void );
@@ -39,4 +38,4 @@ void qio_channel_test_run_reader(QIOChannelTest *test,void qio_channel_test_validate (QIOChannelTest *test); -#endif /* TEST_IO_CHANNEL_HELPERS */ +#endif /* TEST_IO_CHANNEL_HELPERS_H */
Signature · 1 line
2.21.0
PATCH 2/4 scripts/clean-header-guards: Fix handling of trailing comments
In reply to Markus Armbrusterclean-header-guards.pl fails to recognize a header guard #endif when it's followed by a // comment, or multiple comments. Fix that.
--- scripts/clean-header-guards.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
scripts/clean-header-guards.pl +7 -5
@@ -103,7 +103,7 @@ sub preprocess { for my $fname (@ARGV) { my $text = slurp($fname); - $text =~ m,\A(\s*\n|\s*//\N*\n|\s*/\*.*?\*/\s*\n)*|,msg; + $text =~ m,\A(\s*\n|\s*//\N*\n|\s*/\*.*?\*/\s*\n)*|,sg; my $pre = $&; unless ($text =~ /\G(.*\n)/g) { $text =~ /\G.*/;
@@ -137,14 +137,16 @@ for my $fname (@ARGV) { } unless ($body =~ m,\A((.*\n)*) - (\s*\#\s*endif\s*(/\*\s*.*\s*\*/\s*)?\n?) - (\n|\s)*\Z,x) { + ([ \t]*\#[ \t]*endif([ \t]*\N*)\n) + ((?s)(\s*\n|\s*//\N*\n|\s*/\*.*?\*/\s*\n)*) + \Z,x) { skipping($fname, "can't find end of header guard"); next; } $body = $1; my $line3 = $3; my $endif_comment = $4; + my $post = $5; my $oldg = $guard;
@@ -186,14 +188,14 @@ for my $fname (@ARGV) { my $newl1 = "#ifndef $guard\n"; my $newl2 = "#define $guard\n"; my $newl3 = "#endif\n"; - $newl3 =~ s,\Z, /* $guard */, if defined $endif_comment; + $newl3 =~ s,\Z, /* $guard */, if $endif_comment; if ($line1 ne $newl1 or $line2 ne $newl2 or $line3 ne $newl3) { $pre =~ s/\n*\Z/\n\n/ if $pre =~ /\N/; $body =~ s/\A\n*/\n/; if ($opt_n) { print "$fname would be cleaned up\n" if $opt_v; } else { - unslurp($fname, "$pre$newl1$newl2$body$newl3"); + unslurp($fname, "$pre$newl1$newl2$body$newl3$post"); print "$fname cleaned up\n" if $opt_v; } }
Signature · 1 line
2.21.0
PATCH 3/4 Clean up a few header guard symbols
In reply to Markus ArmbrusterCommit 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.
--- contrib/elf2dmp/qemu_elf.h | 5 ++--- include/disas/dis-asm.h | 6 +++--- include/hw/semihosting/console.h | 6 +++--- include/hw/xen/io/ring.h | 6 +++--- target/cris/opcode-cris.h | 6 +++--- tests/migration/migration-test.h | 2 +- .../UefiTestToolsPkg/Include/Guid/BiosTablesTest.h | 6 +++--- 7 files changed, 18 insertions(+), 19 deletions(-)
contrib/elf2dmp/qemu_elf.h +2 -3
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
tests/migration/migration-test.h +1 -1
@@ -32,4 +32,4 @@*/ #define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024) -#endif /* _MIGRATION_TEST_H */ +#endif /* MIGRATION_TEST_H */
tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h +3 -3
@@ -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 */
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH 3/4] Clean up a few header guard symbols
Quoted 168 lines · Markus Armbruster
Commit
58ea30f5145"Clean up header guards that don't match their file name" messed upcontrib/elf2dmp/qemu_elf.handtests/migration/migration-test.h.It missed
target/cris/opcode-cris.handtests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.hdue to thescripts/clean-header-guards.plbug fixed in the previous commit.Commit
a8b991b52dc"Clean up ill-advised or unusual header guards" missedinclude/hw/xen/io/ring.hfor the same reason.Commit
3979fca4b69"disas: Renameinclude/disas/bfd.hback toinclude/disas/dis-asm.h" neglected to update the guard symbol for the rename.Commit
a331c6d7741"semihosting: implement a semihosting console" createdinclude/hw/semihosting/console.hwith an ill-advised guard symbol.Clean them up.
Signed-off-by Markus Armbruster <[email protected]>--- contrib/elf2dmp/qemu_elf.h | 5 ++--- include/disas/dis-asm.h | 6 +++--- include/hw/semihosting/console.h | 6 +++--- include/hw/xen/io/ring.h | 6 +++--- target/cris/opcode-cris.h | 6 +++--- tests/migration/migration-test.h | 2 +- .../UefiTestToolsPkg/Include/Guid/BiosTablesTest.h | 6 +++--- 7 files changed, 18 insertions(+), 19 deletions(-)contrib/elf2dmp/qemu_elf.h +2
-3@@ -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@@ -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@@ -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@@ -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@@ -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: tests/migration/migration-test.h +1
-1@@ -32,4 +32,4 @@*/ #define ARM_TEST_MAX_KERNEL_SIZE (512 * 1024) -#endif /* _MIGRATION_TEST_H */ +#endif /* MIGRATION_TEST_H */ tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h +2
-2@@ -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>
tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h typedef struct { · line 80
Quoted 5 lines
tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h +1
-1@@ -77,4 +77,4 @@ typedef struct { } BIOS_TABLES_TEST;#pragma pack () -#endif // __BIOS_TABLES_TEST_H__ +#endif /* BIOSTABLESTEST_H */
PATCH 4/4 Supply missing header guards
In reply to Markus Armbruster--- hw/9pfs/xen-9pfs.h | 6 +++++- hw/hppa/hppa_hardware.h | 5 +++++ hw/input/adb-internal.h | 4 ++++ hw/net/e1000e_core.h | 5 +++++ hw/net/e1000x_common.h | 5 +++++ hw/net/vmxnet3_defs.h | 6 +++++- hw/usb/hcd-xhci.h | 5 +++++ hw/usb/quirks.h | 5 +++++ include/fpu/softfloat-macros.h | 5 +++++ include/hw/arm/raspi_platform.h | 5 +++++ include/hw/kvm/clock.h | 6 +++++- include/hw/m68k/mcf_fec.h | 5 +++++ include/hw/mips/bios.h | 5 +++++ include/hw/pci-bridge/simba.h | 5 +++++ include/hw/pci/pci_regs.h | 5 +++++ include/hw/qdev-dma.h | 6 ++++++ include/hw/sparc/sparc64.h | 4 ++++ include/hw/timer/xlnx-zynqmp-rtc.h | 5 +++++ include/ui/spice-display.h | 5 +++++ linux-user/aarch64/syscall_nr.h | 4 ++++ linux-user/aarch64/termbits.h | 5 +++++ linux-user/alpha/syscall_nr.h | 5 +++++ linux-user/alpha/termbits.h | 5 +++++ linux-user/arm/syscall_nr.h | 5 +++++ linux-user/arm/termbits.h | 5 +++++ linux-user/cris/syscall_nr.h | 5 +++++ linux-user/cris/termbits.h | 5 +++++ linux-user/errno_defs.h | 6 ++++++ linux-user/flat.h | 5 +++++ linux-user/hppa/sockbits.h | 5 +++++ linux-user/hppa/syscall_nr.h | 5 +++++ linux-user/hppa/termbits.h | 5 +++++ linux-user/i386/syscall_nr.h | 5 +++++ linux-user/i386/termbits.h | 5 +++++ linux-user/m68k/syscall_nr.h | 5 +++++ linux-user/m68k/termbits.h | 5 +++++ linux-user/microblaze/syscall_nr.h | 5 +++++ linux-user/microblaze/termbits.h | 5 +++++ linux-user/mips/syscall_nr.h | 6 ++++++ linux-user/mips/termbits.h | 5 +++++ linux-user/mips64/syscall_nr.h | 5 +++++ linux-user/nios2/syscall_nr.h | 5 +++++ linux-user/nios2/termbits.h | 5 +++++ linux-user/openrisc/syscall_nr.h | 5 +++++ linux-user/openrisc/termbits.h | 5 +++++ linux-user/ppc/syscall_nr.h | 6 ++++++ linux-user/ppc/termbits.h | 5 +++++ linux-user/riscv/syscall_nr.h | 5 +++++ linux-user/riscv/target_syscall.h | 5 +++++ linux-user/riscv/termbits.h | 5 +++++ linux-user/s390x/syscall_nr.h | 5 +++++ linux-user/s390x/termbits.h | 4 ++++ linux-user/sh4/syscall_nr.h | 5 +++++ linux-user/sh4/termbits.h | 5 +++++ linux-user/socket.h | 5 +++++ linux-user/sparc/syscall_nr.h | 5 +++++ linux-user/sparc/termbits.h | 5 +++++ linux-user/sparc64/syscall_nr.h | 5 +++++ linux-user/sparc64/termbits.h | 5 +++++ linux-user/target_flat.h | 6 ++++++ linux-user/x86_64/syscall_nr.h | 5 +++++ linux-user/x86_64/termbits.h | 5 +++++ linux-user/xtensa/target_flat.h | 8 +++++--- target/cris/crisv10-decode.h | 4 ++++ target/cris/mmu.h | 5 +++++ target/microblaze/microblaze-decode.h | 4 ++++ target/microblaze/mmu.h | 5 +++++ target/moxie/mmu.h | 5 +++++ target/riscv/cpu_bits.h | 5 +++++ target/riscv/cpu_user.h | 5 +++++ target/riscv/instmap.h | 5 +++++ target/tricore/tricore-opcodes.h | 5 +++++ tcg/tcg-gvec-desc.h | 5 +++++ tcg/tcg-op-gvec.h | 5 +++++ tests/crypto-tls-psk-helpers.h | 5 +++++ tests/crypto-tls-x509-helpers.h | 5 +++++ tests/libqos/virtio-9p.h | 5 +++++ tests/libqos/virtio-balloon.h | 5 +++++ tests/libqos/virtio-blk.h | 5 +++++ tests/libqos/virtio-net.h | 5 +++++ tests/libqos/virtio-rng.h | 5 +++++ tests/libqos/virtio-scsi.h | 5 +++++ tests/libqos/virtio-serial.h | 5 +++++ tests/socket-helpers.h | 6 +++++- 84 files changed, 419 insertions(+), 7 deletions(-)
hw/9pfs/xen-9pfs.h +5 -1
@@ -8,9 +8,11 @@* * This work is licensed under the terms of the GNU GPL version 2 or * later. See the COPYING file in the top-level directory. -* */ +#ifndef HW_9PFS_XEN_9PFS_H +#define HW_9PFS_XEN_9PFS_H +#include <xen/io/protocols.h> #include "hw/xen/io/ring.h"
@@ -19,3 +21,5 @@* inline functions in c files. */ DEFINE_XEN_FLEX_RING_AND_INTF (xen_9pfs); + +#endif
hw/hppa/hppa_hardware.h +5 -0
@@ -1,5 +1,8 @@/* HPPA cores and system support chips. */ +#ifndef HW_HPPA_HPPA_HARDWARE_H +#define HW_HPPA_HPPA_HARDWARE_H +#define FIRMWARE_START 0xf0000000#define FIRMWARE_END 0xf0800000
@@ -38,3 +41,5 @@#define HPPA_MAX_CPUS 8/* max. number of SMP CPUs */ #define CPU_CLOCK_MHZ 250/* emulate a 250 MHz CPU */ + +#endif
hw/input/adb-internal.h +4 -0
@@ -22,6 +22,9 @@* THE SOFTWARE. */ +#ifndef HW_INPUT_ADB_INTERNAL_H +#define HW_INPUT_ADB_INTERNAL_H +/* ADB commands */ #define ADB_BUSRESET 0x00
@@ -47,3 +50,4 @@extern const VMStateDescription vmstate_adb_device; +#endif
hw/net/e1000e_core.h +5 -0
@@ -33,6 +33,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef HW_NET_E1000E_CORE_H +#define HW_NET_E1000E_CORE_H +#define E1000E_PHY_PAGE_SIZE (0x20)#define E1000E_PHY_PAGES (0x07)#define E1000E_MAC_SIZE (0x8000)
@@ -151,3 +154,5 @@ e1000e_receive_iov(E1000ECore *core, const struct iovec *iov, int iovcnt);void e1000e_start_recv (E1000ECore *core); + +#endif
hw/net/e1000x_common.h +5 -0
@@ -22,6 +22,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef HW_NET_E1000X_COMMON_H +#define HW_NET_E1000X_COMMON_H +#include "e1000_regs.h" #define defreg (x) x = (E1000_##x >> 2)
@@ -209,3 +212,5 @@ typedef struct e1000x_txd_props {void e1000x_read_tx_ctx_descr (struct e1000_context_desc *d,e1000x_txd_props *props); + +#endif
hw/net/vmxnet3_defs.h +5 -1
@@ -12,9 +12,11 @@* * This work is licensed under the terms of the GNU GPL, version 2. * See the COPYING file in the top-level directory. -* */ +#ifndef HW_NET_VMXNET3_DEFS_H +#define HW_NET_VMXNET3_DEFS_H +#include "net/net.h" #include "hw/net/vmxnet3.h"
@@ -131,3 +133,5 @@ typedef struct {/* Compatibility flags for migration */ uint32_t compat_flags; } VMXNET3State; + +#endif
hw/usb/hcd-xhci.h +5 -0
@@ -19,6 +19,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef HW_USB_HCD_XHCI_H +#define HW_USB_HCD_XHCI_H +#define TYPE_XHCI "base-xhci"#define TYPE_NEC_XHCI "nec-usb-xhci"#define TYPE_QEMU_XHCI "qemu-xhci"
@@ -225,3 +228,5 @@ struct XHCIState { bool nec_quirks; }; + +#endif
hw/usb/quirks.h +5 -0
@@ -12,6 +12,9 @@* (at your option) any later version. */ +#ifndef HW_USB_QUIRKS_H +#define HW_USB_QUIRKS_H +/* 1 on 1 copy of linux/drivers/usb/serial/ftdi_sio_ids.h */ #include "quirks-ftdi-ids.h" /* 1 on 1 copy of linux/drivers/usb/serial/pl2303.h */
@@ -908,3 +911,5 @@ static const struct usb_device_id usbredir_ftdi_serial_ids[] = {#undef USB_DEVICE#undef USB_DEVICE_AND_INTERFACE_INFO + +#endif
include/fpu/softfloat-macros.h +5 -0
@@ -79,6 +79,9 @@ this code that are retained.* version 2 or later. See the COPYING file in the top-level directory. */ +#ifndef FPU_SOFTFLOAT_MACROS_H +#define FPU_SOFTFLOAT_MACROS_H +/*---------------------------------------------------------------------------- | Shifts `a' right by the number of bits given in `count'. If any nonzero | bits are shifted off, they are ``jammed'' into the least significant bit of
@@ -796,3 +799,5 @@ static inline flag ne128( uint64_t a0, uint64_t a1, uint64_t b0, uint64_t b1 ) return ( a0 != b0 ) || ( a1 != b1 ); } + +#endif
include/hw/arm/raspi_platform.h +5 -0
@@ -22,6 +22,9 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef HW_ARM_RASPI_PLATFORM_H +#define HW_ARM_RASPI_PLATFORM_H +#define MCORE_OFFSET 0x0000/* Fake frame buffer device * (the multicore sync block) */ #define IC0_OFFSET 0x2000
@@ -126,3 +129,5 @@#define INTERRUPT_VPU1_HALTED 5#define INTERRUPT_ILLEGAL_TYPE0 6#define INTERRUPT_ILLEGAL_TYPE1 7 + +#endif
include/hw/kvm/clock.h +5 -1
@@ -8,9 +8,11 @@* * This work is licensed under the terms of the GNU GPL version 2. * See the COPYING file in the top-level directory. -* */ +#ifndef HW_KVM_CLOCK_H +#define HW_KVM_CLOCK_H +#ifdef CONFIG_KVM void kvmclock_create (void );
@@ -22,3 +24,5 @@ static inline void kvmclock_create(void) }#endif /* !CONFIG_KVM */ + +#endif
include/hw/m68k/mcf_fec.h +5 -0
@@ -7,7 +7,12 @@* (at your option) any later version. */ +#ifndef HW_M68K_MCF_FEC_H +#define HW_M68K_MCF_FEC_H +#define TYPE_MCF_FEC_NET "mcf-fec"#define MCF_FEC_NET (obj) OBJECT_CHECK(mcf_fec_state, (obj), TYPE_MCF_FEC_NET)#define FEC_NUM_IRQ 13 + +#endif
include/hw/mips/bios.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef HW_MIPS_BIOS_H +#define HW_MIPS_BIOS_H +#include "qemu/units.h" #include "cpu.h"
@@ -7,3 +10,5 @@#else #define BIOS_FILENAME "mipsel_bios.bin"#endif + +#endif
include/hw/pci-bridge/simba.h +5 -0
@@ -24,6 +24,9 @@* THE SOFTWARE. */ +#ifndef HW_PCI_BRIDGE_SIMBA_H +#define HW_PCI_BRIDGE_SIMBA_H +#include "hw/pci/pci_bridge.h"
@@ -35,3 +38,5 @@ typedef struct SimbaPCIBridge {#define TYPE_SIMBA_PCI_BRIDGE "pbm-bridge"#define SIMBA_PCI_BRIDGE (obj) \ OBJECT_CHECK(SimbaPCIBridge, (obj), TYPE_SIMBA_PCI_BRIDGE) + +#endif
include/hw/pci/pci_regs.h +5 -0
@@ -1,3 +1,8 @@ +#ifndef HW_PCI_PCI_REGS_H +#define HW_PCI_PCI_REGS_H +#include "standard-headers/linux/pci_regs.h" #define PCI_PM_CAP_VER_1_1 0x0002/* PCI PM spec ver. 1.1 */ + +#endif
include/hw/qdev-dma.h +6 -0
@@ -6,5 +6,11 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + +#ifndef HW_QDEV_DMA_H +#define HW_QDEV_DMA_H +#define DEFINE_PROP_DMAADDR (_n, _s, _f, _d) \ DEFINE_PROP_UINT64(_n, _s, _f, _d) + +#endif
include/hw/sparc/sparc64.h +4 -0
@@ -1,6 +1,10 @@ +#ifndef HW_SPARC_SPARC64_H +#define HW_SPARC_SPARC64_H #define IVEC_MAX 0x40SPARCCPU *sparc64_cpu_devinit (const char *cpu_type,uint64_t prom_addr);void sparc64_cpu_set_ivec_irq (void *opaque,int irq,int level); + +#endif
include/hw/timer/xlnx-zynqmp-rtc.h +5 -0
@@ -24,6 +24,9 @@* THE SOFTWARE. */ +#ifndef HW_TIMER_XLNX_ZYNQMP_RTC_H +#define HW_TIMER_XLNX_ZYNQMP_RTC_H +#include "hw/register.h" #define TYPE_XLNX_ZYNQMP_RTC "xlnx-zynmp.rtc"
@@ -84,3 +87,5 @@ typedef struct XlnxZynqMPRTC {uint32_t regs[XLNX_ZYNQMP_RTC_R_MAX ]; RegisterInfo regs_info[XLNX_ZYNQMP_RTC_R_MAX]; } XlnxZynqMPRTC; + +#endif
include/ui/spice-display.h +5 -0
@@ -15,6 +15,9 @@* along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef UI_SPICE_DISPLAY_H +#define UI_SPICE_DISPLAY_H +#include <spice/ipc_ring.h> #include <spice/enums.h> #include <spice/qxl_dev.h>
@@ -183,3 +186,5 @@ int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd);bool qemu_spice_fill_device_address (QemuConsole *con,char *device_address,size_t size); + +#endif
linux-user/aarch64/syscall_nr.h +4 -0
@@ -2,6 +2,9 @@* This file contains the system call numbers. */ +#ifndef LINUX_USER_AARCH64_SYSCALL_NR_H +#define LINUX_USER_AARCH64_SYSCALL_NR_H +#define TARGET_NR_io_setup 0#define TARGET_NR_io_destroy 1#define TARGET_NR_io_submit 2
@@ -274,3 +277,4 @@#define TARGET_NR_mlock2 284#define TARGET_NR_copy_file_range 285 +#endif
linux-user/aarch64/termbits.h +5 -0
@@ -1,6 +1,9 @@/* from asm/termbits.h */ /* NOTE: exactly the same as i386 */ +#ifndef LINUX_USER_AARCH64_TERMBITS_H +#define LINUX_USER_AARCH64_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -220,3 +223,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/alpha/syscall_nr.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_ALPHA_SYSCALL_NR_H +#define LINUX_USER_ALPHA_SYSCALL_NR_H +#define TARGET_NR_osf_syscall 0/* not implemented */ #define TARGET_NR_exit 1#define TARGET_NR_fork 2
@@ -450,3 +453,5 @@#define TARGET_NR_getrandom 511#define TARGET_NR_memfd_create 512#define TARGET_NR_execveat 513 + +#endif
linux-user/alpha/termbits.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_ALPHA_TERMBITS_H +#define LINUX_USER_ALPHA_TERMBITS_H +typedef unsigned char target_cc_t ;typedef unsigned int target_speed_t ;typedef unsigned int target_tcflag_t ;
@@ -263,3 +266,5 @@ struct target_termios {#define TARGET_TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ #define TARGET_TIOCGHAYESESP 0x545E/* Get Hayes ESP configuration */ #define TARGET_TIOCSHAYESESP 0x545F/* Set Hayes ESP configuration */ + +#endif
linux-user/arm/syscall_nr.h +5 -0
@@ -2,6 +2,9 @@* This file contains the system call numbers. */ +#ifndef LINUX_USER_ARM_SYSCALL_NR_H +#define LINUX_USER_ARM_SYSCALL_NR_H +#define TARGET_NR_restart_syscall ( 0)#define TARGET_NR_exit ( 1)#define TARGET_NR_fork ( 2)
@@ -396,3 +399,5 @@#define TARGET_NR_userfaultfd (388)#define TARGET_NR_membarrier (389)#define TARGET_NR_mlock2 (390) + +#endif
linux-user/arm/termbits.h +5 -0
@@ -1,6 +1,9 @@/* from asm/termbits.h */ /* NOTE: exactly the same as i386 */ +#ifndef LINUX_USER_ARM_TERMBITS_H +#define LINUX_USER_ARM_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -215,3 +218,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/cris/syscall_nr.h +5 -0
@@ -2,6 +2,9 @@* This file contains the system call numbers, and stub macros for libc. */ +#ifndef LINUX_USER_CRIS_SYSCALL_NR_H +#define LINUX_USER_CRIS_SYSCALL_NR_H +#define TARGET_NR_restart_syscall 0#define TARGET_NR_exit 1#define TARGET_NR_fork 2
@@ -360,3 +363,5 @@#define TARGET_NR_memfd_create 357#define TARGET_NR_bpf 358#define TARGET_NR_execveat 359 + +#endif
linux-user/cris/termbits.h +5 -0
@@ -1,5 +1,8 @@/* from asm/termbits.h */ +#ifndef LINUX_USER_CRIS_TERMBITS_H +#define LINUX_USER_CRIS_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -212,3 +215,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/errno_defs.h +6 -0
@@ -4,6 +4,10 @@* * Taken from asm-generic/errno-base.h and asm-generic/errno.h */ + +#ifndef LINUX_USER_ERRNO_DEFS_H +#define LINUX_USER_ERRNO_DEFS_H +#define TARGET_EPERM 1/* Operation not permitted */ #define TARGET_ENOENT 2/* No such file or directory */ #define TARGET_ESRCH 3/* No such process */
@@ -159,3 +163,5 @@* clash with a valid guest errno now or in the future. */ #define TARGET_QEMU_ESIGRETURN 513/* Return from signal */ + +#endif
linux-user/flat.h +5 -0
@@ -7,6 +7,9 @@* support uClinux flat-format executables. */ +#ifndef LINUX_USER_FLAT_H +#define LINUX_USER_FLAT_H +#define FLAT_VERSION 0x00000004L#ifdef CONFIG_BINFMT_SHARED_FLAT
@@ -65,3 +68,5 @@ struct flat_hdr {#define OLD_FLAT_RELOC_TYPE_BSS 2# define OLD_FLAT_FLAG_RAM 0x1/* load program entirely into RAM */ + +#endif
linux-user/hppa/sockbits.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_HPPA_SOCKBITS_H +#define LINUX_USER_HPPA_SOCKBITS_H +#define TARGET_SOL_SOCKET 0xffff#define TARGET_SO_DEBUG 0x0001
@@ -68,3 +71,5 @@* have to define SOCK_NONBLOCK to a different value here. */ #define TARGET_SOCK_NONBLOCK 0x40000000 + +#endif
linux-user/hppa/syscall_nr.h +5 -0
@@ -2,6 +2,9 @@* This file contains the system call numbers. */ +#ifndef LINUX_USER_HPPA_SYSCALL_NR_H +#define LINUX_USER_HPPA_SYSCALL_NR_H +#define TARGET_NR_restart_syscall 0#define TARGET_NR_exit 1#define TARGET_NR_fork 2
@@ -351,3 +354,5 @@#define TARGET_NR_copy_file_range 346#define TARGET_NR_preadv2 347#define TARGET_NR_pwritev2 348 + +#endif
linux-user/hppa/termbits.h +5 -0
@@ -1,5 +1,8 @@/* from asm/termbits.h */ +#ifndef LINUX_USER_HPPA_TERMBITS_H +#define LINUX_USER_HPPA_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -219,3 +222,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/i386/syscall_nr.h +5 -0
@@ -2,6 +2,9 @@* This file contains the system call numbers. */ +#ifndef LINUX_USER_I386_SYSCALL_NR_H +#define LINUX_USER_I386_SYSCALL_NR_H +#define TARGET_NR_restart_syscall 0#define TARGET_NR_exit 1#define TARGET_NR_fork 2
@@ -380,3 +383,5 @@#define TARGET_NR_membarrier 375#define TARGET_NR_mlock2 376#define TARGET_NR_copy_file_range 377 + +#endif
linux-user/i386/termbits.h +5 -0
@@ -1,5 +1,8 @@/* from asm/termbits.h */ +#ifndef LINUX_USER_I386_TERMBITS_H +#define LINUX_USER_I386_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -225,3 +228,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/m68k/syscall_nr.h +5 -0
@@ -2,6 +2,9 @@* This file contains the system call numbers. */ +#ifndef LINUX_USER_M68K_SYSCALL_NR_H +#define LINUX_USER_M68K_SYSCALL_NR_H +#define TARGET_NR_exit 1#define TARGET_NR_fork 2#define TARGET_NR_read 3
@@ -379,3 +382,5 @@#define TARGET_NR_copy_file_range 376#define TARGET_NR_preadv2 377#define TARGET_NR_pwritev2 378 + +#endif
linux-user/m68k/termbits.h +5 -0
@@ -1,6 +1,9 @@/* from asm/termbits.h */ /* NOTE: exactly the same as i386 */ +#ifndef LINUX_USER_M68K_TERMBITS_H +#define LINUX_USER_M68K_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -226,3 +229,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/microblaze/syscall_nr.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_MICROBLAZE_SYSCALL_NR_H +#define LINUX_USER_MICROBLAZE_SYSCALL_NR_H +#define TARGET_NR_restart_syscall 0/* ok */ #define TARGET_NR_exit 1/* ok */ #define TARGET_NR_fork 2/* not for no MMU - weird */
@@ -390,3 +393,5 @@#define TARGET_NR_memfd_create 386#define TARGET_NR_bpf 387#define TARGET_NR_execveat 388 + +#endif
linux-user/microblaze/termbits.h +5 -0
@@ -1,5 +1,8 @@/* from asm/termbits.h */ +#ifndef LINUX_USER_MICROBLAZE_TERMBITS_H +#define LINUX_USER_MICROBLAZE_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -212,3 +215,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/mips/syscall_nr.h +6 -0
@@ -1,6 +1,10 @@/* * Linux o32 style syscalls are in the range from 4000 to 4999. */ + +#ifndef LINUX_USER_MIPS_SYSCALL_NR_H +#define LINUX_USER_MIPS_SYSCALL_NR_H +#define TARGET_NR_Linux 4000#define TARGET_NR_syscall (TARGET_NR_Linux + 0)#define TARGET_NR_exit (TARGET_NR_Linux + 1)
@@ -372,3 +376,5 @@#define TARGET_NR_statx (TARGET_NR_Linux + 366)#define TARGET_NR_rseq (TARGET_NR_Linux + 367)#define TARGET_NR_io_pgetevents (TARGET_NR_Linux + 368) + +#endif
linux-user/mips/termbits.h +5 -0
@@ -1,5 +1,8 @@/* from asm/termbits.h */ +#ifndef LINUX_USER_MIPS_TERMBITS_H +#define LINUX_USER_MIPS_TERMBITS_H +#define TARGET_NCCS 23 struct target_termios {
@@ -256,3 +259,5 @@ struct target_termios {#define TARGET_TIOCGICOUNT 0x5492/* read serial port inline interrupt counts */ #define TARGET_TIOCGHAYESESP 0x5493/* Get Hayes ESP configuration */ #define TARGET_TIOCSHAYESESP 0x5494/* Set Hayes ESP configuration */ + +#endif
linux-user/mips64/syscall_nr.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_MIPS64_SYSCALL_NR_H +#define LINUX_USER_MIPS64_SYSCALL_NR_H +#ifdef TARGET_ABI32 /* * Linux N32 syscalls are in the range from 6000 to 6999.
@@ -672,3 +675,5 @@#define TARGET_NR_rseq (TARGET_NR_Linux + 327)#define TARGET_NR_io_pgetevents (TARGET_NR_Linux + 328)#endif + +#endif
linux-user/nios2/syscall_nr.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_NIOS2_SYSCALL_NR_H +#define LINUX_USER_NIOS2_SYSCALL_NR_H +#define TARGET_NR_io_setup 0#define TARGET_NR_io_destroy 1#define TARGET_NR_io_submit 2
@@ -327,3 +330,5 @@#define TARGET_NR_uselib 1077#define TARGET_NR__sysctl 1078#define TARGET_NR_fork 1079 + +#endif
linux-user/nios2/termbits.h +5 -0
@@ -1,6 +1,9 @@/* from asm/termbits.h */ /* NOTE: exactly the same as i386 */ +#ifndef LINUX_USER_NIOS2_TERMBITS_H +#define LINUX_USER_NIOS2_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -220,3 +223,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/openrisc/syscall_nr.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_OPENRISC_SYSCALL_NR_H +#define LINUX_USER_OPENRISC_SYSCALL_NR_H +#define TARGET_NR_io_setup 0#define TARGET_NR_io_destroy 1#define TARGET_NR_io_submit 2
@@ -502,3 +505,5 @@#define TARGET_NR_stat64 TARGET_NR_3264_stat#define TARGET_NR_lstat64 TARGET_NR_3264_lstat#endif + +#endif
linux-user/openrisc/termbits.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_OPENRISC_TERMBITS_H +#define LINUX_USER_OPENRISC_TERMBITS_H +typedef unsigned char target_openrisc_cc ;/*cc_t*/ typedef unsigned int target_openrisc_speed ;/*speed_t*/ typedef unsigned int target_openrisc_tcflag ;/*tcflag_t*/
@@ -294,3 +297,5 @@ struct target_termios3 {#define TARGET_TIOCPKT_IOCTL 64#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/ppc/syscall_nr.h +6 -0
@@ -1,6 +1,10 @@/* * This file contains the system call numbers. */ + +#ifndef LINUX_USER_PPC_SYSCALL_NR_H +#define LINUX_USER_PPC_SYSCALL_NR_H +#define TARGET_NR_restart_syscall 0#define TARGET_NR_exit 1#define TARGET_NR_fork 2
@@ -394,3 +398,5 @@#define TARGET_NR_shmget 376#define TARGET_NR_shmctl 377#define TARGET_NR_mlock2 378 + +#endif
linux-user/ppc/termbits.h +5 -0
@@ -1,5 +1,8 @@/* from asm/termbits.h */ +#ifndef LINUX_USER_PPC_TERMBITS_H +#define LINUX_USER_PPC_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -235,3 +238,5 @@ struct target_termios {#define TARGET_TIOCMIWAIT 0x545C/* wait for a change on serial input line(s) */ #define TARGET_TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */ + +#endif
linux-user/riscv/syscall_nr.h +5 -0
@@ -3,6 +3,9 @@* of recently-added arches including RISC-V. */ +#ifndef LINUX_USER_RISCV_SYSCALL_NR_H +#define LINUX_USER_RISCV_SYSCALL_NR_H +#define TARGET_NR_io_setup 0#define TARGET_NR_io_destroy 1#define TARGET_NR_io_submit 2
@@ -285,3 +288,5 @@#define TARGET_NR_copy_file_range 285#define TARGET_NR_syscalls (TARGET_NR_copy_file_range + 1) + +#endif
linux-user/riscv/target_syscall.h +5 -0
@@ -5,6 +5,9 @@* Reference: linux/arch/riscv/include/uapi/asm/ptrace.h */ +#ifndef LINUX_USER_RISCV_TARGET_SYSCALL_H +#define LINUX_USER_RISCV_TARGET_SYSCALL_H + struct target_pt_regs { abi_long sepc; abi_long ra;
@@ -54,3 +57,5 @@ struct target_pt_regs {/* clone(flags, newsp, ptidptr, tls, ctidptr) for RISC-V */ /* This comes from linux/kernel/fork.c, CONFIG_CLONE_BACKWARDS */ #define TARGET_CLONE_BACKWARDS + +#endif
linux-user/riscv/termbits.h +5 -0
@@ -1,6 +1,9 @@/* from asm/termbits.h */ /* NOTE: exactly the same as i386 */ +#ifndef LINUX_USER_RISCV_TERMBITS_H +#define LINUX_USER_RISCV_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -220,3 +223,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/s390x/syscall_nr.h +5 -0
@@ -2,6 +2,9 @@* This file contains the system call numbers. */ +#ifndef LINUX_USER_S390X_SYSCALL_NR_H +#define LINUX_USER_S390X_SYSCALL_NR_H +#define TARGET_NR_exit 1#define TARGET_NR_fork 2#define TARGET_NR_read 3
@@ -391,3 +394,5 @@#define TARGET_NR_newfstatat 293#endif + +#endif
linux-user/s390x/termbits.h +4 -0
@@ -6,6 +6,9 @@* Derived from "include/asm-i386/termbits.h" */ +#ifndef LINUX_USER_S390X_TERMBITS_H +#define LINUX_USER_S390X_TERMBITS_H + #define TARGET_NCCS 19 struct target_termios { unsigned int c_iflag; /* input mode flags */
@@ -282,3 +285,4 @@ struct target_ktermios {#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ +#endif
linux-user/sh4/syscall_nr.h +5 -0
@@ -2,6 +2,9 @@* This file contains the system call numbers. */ +#ifndef LINUX_USER_SH4_SYSCALL_NR_H +#define LINUX_USER_SH4_SYSCALL_NR_H +#define TARGET_NR_restart_syscall 0#define TARGET_NR_exit 1#define TARGET_NR_fork 2
@@ -386,3 +389,5 @@#define TARGET_NR_copy_file_range 380#define TARGET_NR_preadv2 381#define TARGET_NR_pwritev2 382 + +#endif
linux-user/sh4/termbits.h +5 -0
@@ -1,5 +1,8 @@/* from asm/termbits.h */ +#ifndef LINUX_USER_SH4_TERMBITS_H +#define LINUX_USER_SH4_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -273,3 +276,5 @@ tus register */serial input line(s) */ #define TARGET_TIOCGICOUNT TARGET_IOR('T', 93, int)/* 0x545D */ /* read serial port inline interrupt counts */ + +#endif
linux-user/socket.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_SOCKET_H +#define LINUX_USER_SOCKET_H +#include "sockbits.h" #ifndef TARGET_ARCH_HAS_SOCKET_TYPES
@@ -35,3 +38,5 @@ enum sock_type {#define TARGET_SOCK_NONBLOCK TARGET_O_NONBLOCK#endif #endif /* TARGET_ARCH_HAS_SOCKET_TYPES */ + +#endif
linux-user/sparc/syscall_nr.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_SPARC_SYSCALL_NR_H +#define LINUX_USER_SPARC_SYSCALL_NR_H +#define TARGET_NR_exit 1/* Common */ #define TARGET_NR_fork 2/* Common */ #define TARGET_NR_read 3/* Common */
@@ -356,3 +359,5 @@#define TARGET_NR_preadv2 358#define TARGET_NR_pwritev2 359#define TARGET_NR_statx 360 + +#endif
linux-user/sparc/termbits.h +5 -0
@@ -1,5 +1,8 @@/* from asm/termbits.h */ +#ifndef LINUX_USER_SPARC_TERMBITS_H +#define LINUX_USER_SPARC_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -278,3 +281,5 @@ struct target_termios {#define TARGET_TIOCSERSETMULTI 0x545B/* Set multiport config */ #define TARGET_TIOCMIWAIT 0x545C/* Wait input */ #define TARGET_TIOCGICOUNT 0x545D/* Read serial port inline interrupt counts */ + +#endif
linux-user/sparc64/syscall_nr.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_SPARC64_SYSCALL_NR_H +#define LINUX_USER_SPARC64_SYSCALL_NR_H +#define TARGET_NR_restart_syscall 0/* Linux Specific */ #define TARGET_NR_exit 1/* Common */ #define TARGET_NR_fork 2/* Common */
@@ -359,3 +362,5 @@#define TARGET_NR_preadv2 358#define TARGET_NR_pwritev2 359#define TARGET_NR_statx 360 + +#endif
linux-user/sparc64/termbits.h +5 -0
@@ -1,5 +1,8 @@/* from asm/termbits.h */ +#ifndef LINUX_USER_SPARC64_TERMBITS_H +#define LINUX_USER_SPARC64_TERMBITS_H +#define TARGET_NCCS 19 struct target_termios {
@@ -278,3 +281,5 @@ struct target_termios {#define TARGET_TIOCSERSETMULTI 0x545B/* Set multiport config */ #define TARGET_TIOCMIWAIT 0x545C/* Wait input */ #define TARGET_TIOCGICOUNT 0x545D/* Read serial port inline interrupt counts */ + +#endif
linux-user/target_flat.h +6 -0
@@ -1,6 +1,10 @@/* If your arch needs to do custom stuff, create your own target_flat.h * header file in linux-user/<your arch>/ */ + +#ifndef LINUX_USER_TARGET_FLAT_H +#define LINUX_USER_TARGET_FLAT_H +#define flat_argvp_envp_on_stack () 1#define flat_reloc_valid (reloc, size) ((reloc) <= (size))#define flat_old_ram_flag (flag) (flag)
@@ -8,3 +12,5 @@#define flat_get_addr_from_rp (rp, relval, flags, persistent) (rp)#define flat_set_persistent (relval, persistent) (*persistent)#define flat_put_addr_at_rp (rp, addr, relval) put_user_ual(addr, rp) + +#endif
linux-user/x86_64/syscall_nr.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_X86_64_SYSCALL_NR_H +#define LINUX_USER_X86_64_SYSCALL_NR_H +#define TARGET_NR_read 0#define TARGET_NR_write 1#define TARGET_NR_open 2
@@ -325,3 +328,5 @@#define TARGET_NR_membarrier 324#define TARGET_NR_mlock2 325#define TARGET_NR_copy_file_range 326 + +#endif
linux-user/x86_64/termbits.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef LINUX_USER_X86_64_TERMBITS_H +#define LINUX_USER_X86_64_TERMBITS_H +#define TARGET_NCCS 19typedef unsigned char target_cc_t ;
@@ -246,3 +249,5 @@ struct target_termios {#define TARGET_TIOCPKT_DOSTOP 32#define TARGET_TIOCSER_TEMT 0x01/* Transmitter physically empty */ + +#endif
linux-user/xtensa/target_flat.h +5 -3
@@ -1,6 +1,6 @@ -/* If your arch needs to do custom stuff, create your own target_flat.h -* header file in linux-user/<your arch>/ -*/ +#ifndef LINUX_USER_XTENSA_TARGET_FLAT_H +#define LINUX_USER_XTENSA_TARGET_FLAT_H +#define flat_argvp_envp_on_stack () 0#define flat_reloc_valid (reloc, size) ((reloc) <= (size))#define flat_old_ram_flag (flag) (flag)
@@ -8,3 +8,5 @@#define flat_get_addr_from_rp (rp, relval, flags, persistent) (rp)#define flat_set_persistent (relval, persistent) (*persistent)#define flat_put_addr_at_rp (rp, addr, relval) put_user_ual(addr, rp) + +#endif
target/cris/crisv10-decode.h +4 -0
@@ -18,6 +18,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef TARGET_CRIS_CRISV10_DECODE_H +#define TARGET_CRIS_CRISV10_DECODE_H +#define CRISV10_MODE_QIMMEDIATE 0#define CRISV10_MODE_REG 1#define CRISV10_MODE_INDIRECT 2
@@ -106,3 +109,4 @@#define CRISV10_IND_MOVEM_M_R 14#define CRISV10_IND_MOVEM_R_M 15 +#endif
target/cris/mmu.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_CRIS_MMU_H +#define TARGET_CRIS_MMU_H +#define CRIS_MMU_ERR_EXEC 0#define CRIS_MMU_ERR_READ 1#define CRIS_MMU_ERR_WRITE 2
@@ -15,3 +18,5 @@ void cris_mmu_flush_pid(CPUCRISState *env, uint32_t pid);int cris_mmu_translate (struct cris_mmu_result *res,CPUCRISState *env,uint32_t vaddr,int rw,int mmu_idx,int debug); + +#endif
target/microblaze/microblaze-decode.h +4 -0
@@ -17,6 +17,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef TARGET_MICROBLAZE_MICROBLAZE_DECODE_H +#define TARGET_MICROBLAZE_MICROBLAZE_DECODE_H +/* Convenient binary macros. */ #define HEX__ (n) 0x##n##LU#define B8__ (x) ((x&0x0000000FLU)?1:0) \
@@ -53,3 +56,4 @@#define DEC_STREAM {B8(00010011), B8(00110111)} +#endif
target/microblaze/mmu.h +5 -0
@@ -17,6 +17,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef TARGET_MICROBLAZE_MMU_H +#define TARGET_MICROBLAZE_MMU_H +#define MMU_R_PID 0#define MMU_R_ZPR 1#define MMU_R_TLBX 2
@@ -93,3 +96,5 @@ unsigned int mmu_translate(struct microblaze_mmu *mmu,uint32_t mmu_read (CPUMBState *env,bool ea,uint32_t rn);void mmu_write (CPUMBState *env,bool ea,uint32_t rn,uint32_t v);void mmu_init (struct microblaze_mmu *mmu); + +#endif
target/moxie/mmu.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_MOXIE_MMU_H +#define TARGET_MOXIE_MMU_H +#define MOXIE_MMU_ERR_EXEC 0#define MOXIE_MMU_ERR_READ 1#define MOXIE_MMU_ERR_WRITE 2
@@ -12,3 +15,5 @@ typedef struct {int moxie_mmu_translate (MoxieMMUResult *res,CPUMoxieState *env,uint32_t vaddr,int rw,int mmu_idx); + +#endif
target/riscv/cpu_bits.h +5 -0
@@ -1,5 +1,8 @@/* RISC-V ISA constants */ +#ifndef TARGET_RISCV_CPU_BITS_H +#define TARGET_RISCV_CPU_BITS_H +#define get_field (reg, mask) (((reg) & \ (target_ulong)(mask)) / ((mask) & ~((mask) << 1)))#define set_field (reg, mask, val) (((reg) & ~(target_ulong)(mask)) | \
@@ -527,3 +530,5 @@#define SIP_SSIP MIP_SSIP#define SIP_STIP MIP_STIP#define SIP_SEIP MIP_SEIP + +#endif
target/riscv/cpu_user.h +5 -0
@@ -1,3 +1,6 @@ +#ifndef TARGET_RISCV_CPU_USER_H +#define TARGET_RISCV_CPU_USER_H +#define xRA 1/* return address (aka link register) */ #define xSP 2/* stack pointer */ #define xGP 3/* global pointer */
@@ -12,3 +15,5 @@#define xA6 16#define xA7 17/* syscall number for RVI ABI */ #define xT0 5/* syscall number for RVE ABI */ + +#endif
target/riscv/instmap.h +5 -0
@@ -16,6 +16,9 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef TARGET_RISCV_INSTMAP_H +#define TARGET_RISCV_INSTMAP_H +#define MASK_OP_MAJOR (op) (op & 0x7F)enum { /* rv32i, rv64i, rv32m */
@@ -362,3 +365,5 @@ enum {#define GET_C_RS2 (inst) extract32(inst, 2, 5)#define GET_C_RS1S (inst) (8 + extract32(inst, 7, 3))#define GET_C_RS2S (inst) (8 + extract32(inst, 2, 3)) + +#endif
target/tricore/tricore-opcodes.h +5 -0
@@ -15,6 +15,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef TARGET_TRICORE_TRICORE_OPCODES_H +#define TARGET_TRICORE_TRICORE_OPCODES_H +/* * Opcode Masks for Tricore * Format MASK_OP_InstrFormatName_Field
@@ -1467,3 +1470,5 @@ enum {OPC2_32_SYS_RESTORE =0x0e , OPC2_32_SYS_FRET = 0x03, }; + +#endif
tcg/tcg-gvec-desc.h +5 -0
@@ -17,6 +17,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef TCG_TCG_GVEC_DESC_H +#define TCG_TCG_GVEC_DESC_H +/* ??? These bit widths are set for ARM SVE, maxing out at 256 byte vectors. */ #define SIMD_OPRSZ_SHIFT 0#define SIMD_OPRSZ_BITS 5
@@ -47,3 +50,5 @@ static inline int32_t simd_data(uint32_t desc) {return sextract32 (desc,SIMD_DATA_SHIFT ,SIMD_DATA_BITS ); } + +#endif
tcg/tcg-op-gvec.h +5 -0
@@ -17,6 +17,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef TCG_TCG_OP_GVEC_H +#define TCG_TCG_OP_GVEC_H +/* * "Generic" vectors. All operands are given as offsets from ENV, * and therefore cannot also be allocated via tcg_global_mem_new_*.
@@ -373,3 +376,5 @@ void tcg_gen_vec_shr8i_i64(TCGv_i64 d, TCGv_i64 a, int64_t);void tcg_gen_vec_shr16i_i64 (TCGv_i64 d,TCGv_i64 a,int64_t );void tcg_gen_vec_sar8i_i64 (TCGv_i64 d,TCGv_i64 a,int64_t );void tcg_gen_vec_sar16i_i64 (TCGv_i64 d,TCGv_i64 a,int64_t ); + +#endif
tests/crypto-tls-psk-helpers.h +5 -0
@@ -18,6 +18,9 @@* Author: Richard W.M. Jones <[email protected]> */ +#ifndef TESTS_CRYPTO_TLS_PSK_HELPERS_H +#define TESTS_CRYPTO_TLS_PSK_HELPERS_H +#include <gnutls/gnutls.h> #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
@@ -27,3 +30,5 @@ void test_tls_psk_init(const char *keyfile);void test_tls_psk_cleanup (const char *keyfile);#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */ + +#endif
tests/crypto-tls-x509-helpers.h +5 -0
@@ -18,6 +18,9 @@* Author: Daniel P. Berrange <[email protected]> */ +#ifndef TESTS_CRYPTO_TLS_X509_HELPERS_H +#define TESTS_CRYPTO_TLS_X509_HELPERS_H +#include <gnutls/gnutls.h> #include <gnutls/x509.h>
@@ -126,3 +129,5 @@ void test_tls_cleanup(const char *keyfile);extern const ASN1_ARRAY_TYPE pkix_asn1_tab[];#endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */ + +#endif
tests/libqos/virtio-9p.h +5 -0
@@ -16,6 +16,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ +#ifndef TESTS_LIBQOS_VIRTIO_9P_H +#define TESTS_LIBQOS_VIRTIO_9P_H +#include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h"
@@ -40,3 +43,5 @@ struct QVirtio9PDevice {QOSGraphObject obj; QVirtio9P v9p; }; + +#endif
tests/libqos/virtio-balloon.h +5 -0
@@ -16,6 +16,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ +#ifndef TESTS_LIBQOS_VIRTIO_BALLOON_H +#define TESTS_LIBQOS_VIRTIO_BALLOON_H +#include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h"
@@ -37,3 +40,5 @@ struct QVirtioBalloonDevice {QOSGraphObject obj; QVirtioBalloon balloon; }; + +#endif
tests/libqos/virtio-blk.h +5 -0
@@ -16,6 +16,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ +#ifndef TESTS_LIBQOS_VIRTIO_BLK_H +#define TESTS_LIBQOS_VIRTIO_BLK_H +#include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h"
@@ -38,3 +41,5 @@ struct QVirtioBlkDevice {QOSGraphObject obj; QVirtioBlk blk; }; + +#endif
tests/libqos/virtio-net.h +5 -0
@@ -16,6 +16,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ +#ifndef TESTS_LIBQOS_VIRTIO_NET_H +#define TESTS_LIBQOS_VIRTIO_NET_H +#include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h"
@@ -39,3 +42,5 @@ struct QVirtioNetDevice {QOSGraphObject obj; QVirtioNet net; }; + +#endif
tests/libqos/virtio-rng.h +5 -0
@@ -16,6 +16,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ +#ifndef TESTS_LIBQOS_VIRTIO_RNG_H +#define TESTS_LIBQOS_VIRTIO_RNG_H +#include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h"
@@ -37,3 +40,5 @@ struct QVirtioRngDevice {QOSGraphObject obj; QVirtioRng rng; }; + +#endif
tests/libqos/virtio-scsi.h +5 -0
@@ -16,6 +16,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ +#ifndef TESTS_LIBQOS_VIRTIO_SCSI_H +#define TESTS_LIBQOS_VIRTIO_SCSI_H +#include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h"
@@ -37,3 +40,5 @@ struct QVirtioSCSIDevice {QOSGraphObject obj; QVirtioSCSI scsi; }; + +#endif
tests/libqos/virtio-serial.h +5 -0
@@ -16,6 +16,9 @@* License along with this library; if not, see <http://www.gnu.org/licenses/> */ +#ifndef TESTS_LIBQOS_VIRTIO_SERIAL_H +#define TESTS_LIBQOS_VIRTIO_SERIAL_H +#include "libqos/qgraph.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h"
@@ -37,3 +40,5 @@ struct QVirtioSerialDevice {QOSGraphObject obj; QVirtioSerial serial; }; + +#endif
tests/socket-helpers.h +5 -1
@@ -15,9 +15,11 @@* * 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 TESTS_SOCKET_HELPERS_H +#define TESTS_SOCKET_HELPERS_H +/* * @hostname: a DNS name or numeric IP address *
@@ -40,3 +42,5 @@ int socket_can_bind_connect(const char *hostname);* Returns 0 on success, -1 on fatal error */ int socket_check_protocol_support (bool *has_ipv4,bool *has_ipv6); + +#endif
Signature · 1 line
2.21.0
[Qemu-devel] [PATCH 5/4] Clean up a header guard symbols (again)
In reply to Markus ArmbrusterCommit d52c454aad "contrib: add vhost-user-gpu" and "c68082c43a
virtio-gpu: split virtio-gpu-pci & virtio-vga" created headers with unusual header guard symbols. Clean them up
--- contrib/vhost-user-gpu/virgl.h | 5 +++-- contrib/vhost-user-gpu/vugbm.h | 5 +++-- contrib/vhost-user-gpu/vugpu.h | 5 +++-- hw/display/virtio-vga.h | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-)
contrib/vhost-user-gpu/virgl.h +3 -2
@@ -11,8 +11,9 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ -#ifndef VUGPU_VIRGL_H_ -#define VUGPU_VIRGL_H_ + +#ifndef VUGPU_VIRGL_H +#define VUGPU_VIRGL_H #include "vugpu.h"
contrib/vhost-user-gpu/vugbm.h +3 -2
@@ -6,8 +6,9 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ -#ifndef VHOST_USER_GPU_GBM_H -#define VHOST_USER_GPU_GBM_H + +#ifndef VHOST_USER_GPU_VUGBM_H +#define VHOST_USER_GPU_VUGBM_H #include "qemu/osdep.h"
contrib/vhost-user-gpu/vugpu.h +3 -2
@@ -11,8 +11,9 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ -#ifndef VUGPU_H_ -#define VUGPU_H_ + +#ifndef VUGPU_H +#define VUGPU_H #include "qemu/osdep.h"
hw/display/virtio-vga.h +3 -3
@@ -1,5 +1,5 @@ -#ifndef VIRTIO_VGA_H_ -#define VIRTIO_VGA_H_ +#ifndef VIRTIO_VGA_H +#define VIRTIO_VGA_H #include "hw/virtio/virtio-gpu-pci.h" #include "vga_int.h"
@@ -29,4 +29,4 @@ typedef struct VirtIOVGABaseClass { DeviceReset parent_reset; } VirtIOVGABaseClass; -#endif /* VIRTIO_VGA_H_ */ +#endif /* VIRTIO_VGA_H */
Signature · 1 line
2.21.0
Queued.