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.

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

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220506134911.2856099-2-armbru@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
[Change to generated file ebpf/rss.bpf.skeleton.h backed out]
This commit is contained in:
Markus Armbruster 2022-05-06 15:49:08 +02:00
parent 178bacb66d
commit 52581c718c
58 changed files with 148 additions and 151 deletions

View File

@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef TCG_CPUS_ICOUNT_H #ifndef TCG_ACCEL_OPS_ICOUNT_H
#define TCG_CPUS_ICOUNT_H #define TCG_ACCEL_OPS_ICOUNT_H
void icount_handle_deadline(void); void icount_handle_deadline(void);
void icount_prepare_for_run(CPUState *cpu); void icount_prepare_for_run(CPUState *cpu);
@ -16,4 +16,4 @@ void icount_process_data(CPUState *cpu);
void icount_handle_interrupt(CPUState *cpu, int mask); void icount_handle_interrupt(CPUState *cpu, int mask);
#endif /* TCG_CPUS_ICOUNT_H */ #endif /* TCG_ACCEL_OPS_ICOUNT_H */

View File

@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef TCG_CPUS_MTTCG_H #ifndef TCG_ACCEL_OPS_MTTCG_H
#define TCG_CPUS_MTTCG_H #define TCG_ACCEL_OPS_MTTCG_H
/* kick MTTCG vCPU thread */ /* kick MTTCG vCPU thread */
void mttcg_kick_vcpu_thread(CPUState *cpu); void mttcg_kick_vcpu_thread(CPUState *cpu);
@ -16,4 +16,4 @@ void mttcg_kick_vcpu_thread(CPUState *cpu);
/* start an mttcg vCPU thread */ /* start an mttcg vCPU thread */
void mttcg_start_vcpu_thread(CPUState *cpu); void mttcg_start_vcpu_thread(CPUState *cpu);
#endif /* TCG_CPUS_MTTCG_H */ #endif /* TCG_ACCEL_OPS_MTTCG_H */

View File

@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef TCG_CPUS_RR_H #ifndef TCG_ACCEL_OPS_RR_H
#define TCG_CPUS_RR_H #define TCG_ACCEL_OPS_RR_H
#define TCG_KICK_PERIOD (NANOSECONDS_PER_SECOND / 10) #define TCG_KICK_PERIOD (NANOSECONDS_PER_SECOND / 10)
@ -18,4 +18,4 @@ void rr_kick_vcpu_thread(CPUState *unused);
/* start the round robin vcpu thread */ /* start the round robin vcpu thread */
void rr_start_vcpu_thread(CPUState *cpu); void rr_start_vcpu_thread(CPUState *cpu);
#endif /* TCG_CPUS_RR_H */ #endif /* TCG_ACCEL_OPS_RR_H */

View File

@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef TCG_CPUS_H #ifndef TCG_ACCEL_OPS_H
#define TCG_CPUS_H #define TCG_ACCEL_OPS_H
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
@ -19,4 +19,4 @@ int tcg_cpus_exec(CPUState *cpu);
void tcg_handle_interrupt(CPUState *cpu, int mask); void tcg_handle_interrupt(CPUState *cpu, int mask);
void tcg_cpu_init_cflags(CPUState *cpu, bool parallel); void tcg_cpu_init_cflags(CPUState *cpu, bool parallel);
#endif /* TCG_CPUS_H */ #endif /* TCG_ACCEL_OPS_H */

View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef BLOCK_COROUTINES_INT_H #ifndef BLOCK_COROUTINES_H
#define BLOCK_COROUTINES_INT_H #define BLOCK_COROUTINES_H
#include "block/block_int.h" #include "block/block_int.h"
@ -129,4 +129,4 @@ blk_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes);
int generated_co_wrapper blk_do_flush(BlockBackend *blk); int generated_co_wrapper blk_do_flush(BlockBackend *blk);
#endif /* BLOCK_COROUTINES_INT_H */ #endif /* BLOCK_COROUTINES_H */

View File

@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _TARGET_ARCH_SYSCALL_H_ #ifndef ARM_TARGET_SYSCALL_H
#define _TARGET_ARCH_SYSCALL_H_ #define ARM_TARGET_SYSCALL_H
struct target_pt_regs { struct target_pt_regs {
abi_long uregs[17]; abi_long uregs[17];
@ -52,4 +52,4 @@ struct target_pt_regs {
#define TARGET_HW_MACHINE "arm" #define TARGET_HW_MACHINE "arm"
#define TARGET_HW_MACHINE_ARCH "armv7" #define TARGET_HW_MACHINE_ARCH "armv7"
#endif /* !_TARGET_ARCH_SYSCALL_H_ */ #endif /* ARM_TARGET_SYSCALL_H */

View File

@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef TARGET_ARCH_H #ifndef TARGET_H
#define TARGET_ARCH_H #define TARGET_H
/* /*
* i386 doesn't 'lump' the registers for 64-bit args. * i386 doesn't 'lump' the registers for 64-bit args.
@ -17,5 +17,4 @@ static inline bool regpairs_aligned(void *cpu_env)
return false; return false;
} }
#endif /* ! TARGET_ARCH_H */ #endif /* TARGET_H */

View File

@ -17,8 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef BSD_USER_ARCH_SYSARCH_H_ #ifndef TARGET_ARCH_SYSARCH_H
#define BSD_USER_ARCH_SYSARCH_H_ #define TARGET_ARCH_SYSARCH_H
#include "target_syscall.h" #include "target_syscall.h"
@ -74,4 +74,4 @@ static inline void do_freebsd_arch_print_sysarch(
TARGET_ABI_FMT_lx ")", name->name, (int)arg1, arg2, arg3, arg4); TARGET_ABI_FMT_lx ")", name->name, (int)arg1, arg2, arg3, arg4);
} }
#endif /* !BSD_USER_ARCH_SYSARCH_H_ */ #endif /* TARGET_ARCH_SYSARCH_H */

View File

@ -16,8 +16,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef BSD_USER_ARCH_SYSARCH_H_ #ifndef TARGET_ARCH_SYSARCH_H
#define BSD_USER_ARCH_SYSARCH_H_ #define TARGET_ARCH_SYSARCH_H
#include "target_syscall.h" #include "target_syscall.h"
@ -73,4 +73,4 @@ static inline void do_freebsd_arch_print_sysarch(
TARGET_ABI_FMT_lx ")", name->name, (int)arg1, arg2, arg3, arg4); TARGET_ABI_FMT_lx ")", name->name, (int)arg1, arg2, arg3, arg4);
} }
#endif /*! BSD_USER_ARCH_SYSARCH_H_ */ #endif /* TARGET_ARCH_SYSARCH_H */

View File

@ -6,8 +6,8 @@
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
*/ */
#ifndef HW_I386_E820_H #ifndef HW_I386_E820_MEMORY_LAYOUT_H
#define HW_I386_E820_H #define HW_I386_E820_MEMORY_LAYOUT_H
/* e820 types */ /* e820 types */
#define E820_RAM 1 #define E820_RAM 1

View File

@ -29,8 +29,8 @@
/* This file is autogenerated, DO NOT EDIT! */ /* This file is autogenerated, DO NOT EDIT! */
#ifndef __CTU_CAN_FD_CAN_FD_FRAME_FORMAT__ #ifndef HW_CAN_CTU_CAN_FD_FRAME_H
#define __CTU_CAN_FD_CAN_FD_FRAME_FORMAT__ #define HW_CAN_CTU_CAN_FD_FRAME_H
/* CAN_Frame_format memory map */ /* CAN_Frame_format memory map */
enum ctu_can_fd_can_frame_format { enum ctu_can_fd_can_frame_format {

View File

@ -29,8 +29,8 @@
/* This file is autogenerated, DO NOT EDIT! */ /* This file is autogenerated, DO NOT EDIT! */
#ifndef __CTU_CAN_FD_CAN_FD_REGISTER_MAP__ #ifndef HW_CAN_CTU_CAN_FD_REGS_H
#define __CTU_CAN_FD_CAN_FD_REGISTER_MAP__ #define HW_CAN_CTU_CAN_FD_REGS_H
/* CAN_Registers memory map */ /* CAN_Registers memory map */
enum ctu_can_fd_can_registers { enum ctu_can_fd_can_registers {

View File

@ -15,8 +15,8 @@
* This code is licensed under the GNU GPL v2 or later. * This code is licensed under the GNU GPL v2 or later.
*/ */
#ifndef HW_NVME_INTERNAL_H #ifndef HW_NVME_NVME_H
#define HW_NVME_INTERNAL_H #define HW_NVME_NVME_H
#include "qemu/uuid.h" #include "qemu/uuid.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
@ -519,4 +519,4 @@ void nvme_rw_complete_cb(void *opaque, int ret);
uint16_t nvme_map_dptr(NvmeCtrl *n, NvmeSg *sg, size_t len, uint16_t nvme_map_dptr(NvmeCtrl *n, NvmeSg *sg, size_t len,
NvmeCmd *cmd); NvmeCmd *cmd);
#endif /* HW_NVME_INTERNAL_H */ #endif /* HW_NVME_NVME_H */

View File

@ -16,8 +16,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef HW_USB_DWC2_H #ifndef HW_USB_HCD_DWC2_H
#define HW_USB_DWC2_H #define HW_USB_HCD_DWC2_H
#include "qemu/timer.h" #include "qemu/timer.h"
#include "hw/irq.h" #include "hw/irq.h"

View File

@ -12,8 +12,8 @@
* the COPYING file in the top-level directory. * the COPYING file in the top-level directory.
*/ */
#ifndef BLOCK_HMP_COMMANDS_H #ifndef BLOCK_BLOCK_HMP_CMDS_H
#define BLOCK_HMP_COMMANDS_H #define BLOCK_BLOCK_HMP_CMDS_H
void hmp_drive_add(Monitor *mon, const QDict *qdict); void hmp_drive_add(Monitor *mon, const QDict *qdict);

View File

@ -8,8 +8,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef QCRYPTO_TLSCIPHERSUITES_H #ifndef QCRYPTO_TLS_CIPHER_SUITES_H
#define QCRYPTO_TLSCIPHERSUITES_H #define QCRYPTO_TLS_CIPHER_SUITES_H
#include "qom/object.h" #include "qom/object.h"
#include "crypto/tlscreds.h" #include "crypto/tlscreds.h"
@ -31,4 +31,4 @@ DECLARE_INSTANCE_CHECKER(QCryptoTLSCipherSuites, QCRYPTO_TLS_CIPHER_SUITES,
GByteArray *qcrypto_tls_cipher_suites_get_data(QCryptoTLSCipherSuites *obj, GByteArray *qcrypto_tls_cipher_suites_get_data(QCryptoTLSCipherSuites *obj,
Error **errp); Error **errp);
#endif /* QCRYPTO_TLSCIPHERSUITES_H */ #endif /* QCRYPTO_TLS_CIPHER_SUITES_H */

View File

@ -56,8 +56,8 @@
* *
*/ */
#ifndef HW_ACPI_GED_H #ifndef HW_ACPI_GENERIC_EVENT_DEVICE_H
#define HW_ACPI_GED_H #define HW_ACPI_GENERIC_EVENT_DEVICE_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/acpi/memory_hotplug.h" #include "hw/acpi/memory_hotplug.h"

View File

@ -9,8 +9,9 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef HW_I2C_ARM_SBCON_H
#define HW_I2C_ARM_SBCON_H #ifndef HW_I2C_ARM_SBCON_I2C_H
#define HW_I2C_ARM_SBCON_I2C_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/i2c/bitbang_i2c.h" #include "hw/i2c/bitbang_i2c.h"
@ -34,4 +35,4 @@ struct ArmSbconI2CState {
int in; int in;
}; };
#endif /* HW_I2C_ARM_SBCON_H */ #endif /* HW_I2C_ARM_SBCON_I2C_H */

View File

@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef HW_MISC_CPRMAN_H #ifndef HW_MISC_BCM2835_CPRMAN_H
#define HW_MISC_CPRMAN_H #define HW_MISC_BCM2835_CPRMAN_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/qdev-clock.h" #include "hw/qdev-clock.h"

View File

@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef HW_MISC_CPRMAN_INTERNALS_H #ifndef HW_MISC_BCM2835_CPRMAN_INTERNALS_H
#define HW_MISC_CPRMAN_INTERNALS_H #define HW_MISC_BCM2835_CPRMAN_INTERNALS_H
#include "hw/registerfields.h" #include "hw/registerfields.h"
#include "hw/misc/bcm2835_cprman.h" #include "hw/misc/bcm2835_cprman.h"

View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef HW_STM_EXTI_H #ifndef HW_STM32F4XX_EXTI_H
#define HW_STM_EXTI_H #define HW_STM32F4XX_EXTI_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "qom/object.h" #include "qom/object.h"

View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef HW_STM_SYSCFG_H #ifndef HW_STM32F4XX_SYSCFG_H
#define HW_STM_SYSCFG_H #define HW_STM32F4XX_SYSCFG_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "qom/object.h" #include "qom/object.h"

View File

@ -51,8 +51,8 @@
* 1: OSPI direct access mode. * 1: OSPI direct access mode.
*/ */
#ifndef XILINX_VERSAL_PMC_IOU_SLCR_H #ifndef XLNX_VERSAL_PMC_IOU_SLCR_H
#define XILINX_VERSAL_PMC_IOU_SLCR_H #define XLNX_VERSAL_PMC_IOU_SLCR_H
#include "hw/register.h" #include "hw/register.h"
@ -75,4 +75,4 @@ struct XlnxVersalPmcIouSlcr {
RegisterInfo regs_info[XILINX_VERSAL_PMC_IOU_SLCR_R_MAX]; RegisterInfo regs_info[XILINX_VERSAL_PMC_IOU_SLCR_R_MAX];
}; };
#endif /* XILINX_VERSAL_PMC_IOU_SLCR_H */ #endif /* XLNX_VERSAL_PMC_IOU_SLCR_H */

View File

@ -4,8 +4,9 @@
* *
* Copyright (c) 2008-2021 QEMU contributors * Copyright (c) 2008-2021 QEMU contributors
*/ */
#ifndef HW_NET_MV88W8618_H
#define HW_NET_MV88W8618_H #ifndef HW_NET_MV88W8618_ETH_H
#define HW_NET_MV88W8618_ETH_H
#define TYPE_MV88W8618_ETH "mv88w8618_eth" #define TYPE_MV88W8618_ETH "mv88w8618_eth"

View File

@ -6,8 +6,8 @@
* *
*/ */
#ifndef HW_NUBUS_MAC_H #ifndef HW_NUBUS_MAC_NUBUS_BRIDGE_H
#define HW_NUBUS_MAC_H #define HW_NUBUS_MAC_NUBUS_BRIDGE_H
#include "hw/nubus/nubus.h" #include "hw/nubus/nubus.h"
#include "qom/object.h" #include "qom/object.h"

View File

@ -8,8 +8,8 @@
* *
*/ */
#ifndef REMOTE_PCIHOST_H #ifndef PCI_HOST_REMOTE_H
#define REMOTE_PCIHOST_H #define PCI_HOST_REMOTE_H
#include "exec/memory.h" #include "exec/memory.h"
#include "hw/pci/pcie_host.h" #include "hw/pci/pcie_host.h"

View File

@ -4,8 +4,9 @@
* *
* Based on include/sbi/{fw_dynamic.h,sbi_scratch.h} from the OpenSBI project. * Based on include/sbi/{fw_dynamic.h,sbi_scratch.h} from the OpenSBI project.
*/ */
#ifndef OPENSBI_H
#define OPENSBI_H #ifndef RISCV_BOOT_OPENSBI_H
#define RISCV_BOOT_OPENSBI_H
/** Expected value of info magic ('OSBI' ascii string in hex) */ /** Expected value of info magic ('OSBI' ascii string in hex) */
#define FW_DYNAMIC_INFO_MAGIC_VALUE 0x4942534f #define FW_DYNAMIC_INFO_MAGIC_VALUE 0x4942534f

View File

@ -16,8 +16,8 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef HW_SHAKTI_H #ifndef HW_SHAKTI_C_H
#define HW_SHAKTI_H #define HW_SHAKTI_C_H
#include "hw/riscv/riscv_hart.h" #include "hw/riscv/riscv_hart.h"
#include "hw/boards.h" #include "hw/boards.h"

View File

@ -9,8 +9,8 @@
* version. * version.
*/ */
#ifndef HW_RTC_SUN4V #ifndef HW_RTC_SUN4V_RTC_H
#define HW_RTC_SUN4V #define HW_RTC_SUN4V_RTC_H
#include "exec/hwaddr.h" #include "exec/hwaddr.h"

View File

@ -24,8 +24,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef HW_RTC_XLNX_ZYNQMP_H #ifndef HW_RTC_XLNX_ZYNQMP_RTC_H
#define HW_RTC_XLNX_ZYNQMP_H #define HW_RTC_XLNX_ZYNQMP_RTC_H
#include "hw/register.h" #include "hw/register.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"

View File

@ -21,8 +21,8 @@
* this program. If not, see <http://www.gnu.org/licenses/>. * this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef HW_RX_RX62N_MCU_H #ifndef HW_RX_RX62N_H
#define HW_RX_RX62N_MCU_H #define HW_RX_RX62N_H
#include "target/rx/cpu.h" #include "target/rx/cpu.h"
#include "hw/intc/rx_icu.h" #include "hw/intc/rx_icu.h"

View File

@ -9,8 +9,8 @@
* later. See the COPYING file in the top-level directory. * later. See the COPYING file in the top-level directory.
*/ */
#ifndef TMP105_REGS_H #ifndef EMC141X_REGS_H
#define TMP105_REGS_H #define EMC141X_REGS_H
#define EMC1413_DEVICE_ID 0x21 #define EMC1413_DEVICE_ID 0x21
#define EMC1414_DEVICE_ID 0x25 #define EMC1414_DEVICE_ID 0x25

View File

@ -49,8 +49,8 @@
* + Property "indac-write-disabled": Disable indirect access writes. * + Property "indac-write-disabled": Disable indirect access writes.
*/ */
#ifndef XILINX_VERSAL_OSPI_H #ifndef XLNX_VERSAL_OSPI_H
#define XILINX_VERSAL_OSPI_H #define XLNX_VERSAL_OSPI_H
#include "hw/register.h" #include "hw/register.h"
#include "hw/ssi/ssi.h" #include "hw/ssi/ssi.h"
@ -108,4 +108,4 @@ struct XlnxVersalOspi {
uint8_t stig_membank[512]; uint8_t stig_membank[512];
}; };
#endif /* XILINX_VERSAL_OSPI_H */ #endif /* XLNX_VERSAL_OSPI_H */

View File

@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef BCM2835_SYSTIMER_H #ifndef BCM2835_SYSTMR_H
#define BCM2835_SYSTIMER_H #define BCM2835_SYSTMR_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/irq.h" #include "hw/irq.h"

View File

@ -15,9 +15,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef HW_TRICORE_TESTDEVICE_H
#ifndef HW_TRICORE_TESTDEV_H #define HW_TRICORE_TESTDEVICE_H
#define HW_TRICORE_TESTDEV_H
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/hw.h" #include "hw/hw.h"

View File

@ -39,8 +39,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef DWC2_HW_H #ifndef DWC2_REGS_H
#define DWC2_HW_H #define DWC2_REGS_H
#define HSOTG_REG(x) (x) #define HSOTG_REG(x) (x)
@ -896,4 +896,4 @@ struct dwc2_dma_desc {
#define MAX_DMA_DESC_NUM_GENERIC 64 #define MAX_DMA_DESC_NUM_GENERIC 64
#define MAX_DMA_DESC_NUM_HS_ISOC 256 #define MAX_DMA_DESC_NUM_HS_ISOC 256
#endif /* __DWC2_HW_H__ */ #endif /* DWC2_REGS_H */

View File

@ -10,8 +10,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef HW_USB_MUSB_H #ifndef HW_USB_HCD_MUSB_H
#define HW_USB_MUSB_H #define HW_USB_HCD_MUSB_H
enum musb_irq_source_e { enum musb_irq_source_e {
musb_irq_suspend = 0, musb_irq_suspend = 0,

View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef XLNX_VERSAL_USB_SUBSYSTEM_H #ifndef XLNX_USB_SUBSYSTEM_H
#define XLNX_VERSAL_USB_SUBSYSTEM_H #define XLNX_USB_SUBSYSTEM_H
#include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h"
#include "hw/usb/hcd-dwc3.h" #include "hw/usb/hcd-dwc3.h"

View File

@ -23,8 +23,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef XLNX_USB2_REGS_H #ifndef XLNX_VERSAL_USB2_CTRL_REGS_H
#define XLNX_USB2_REGS_H #define XLNX_VERSAL_USB2_CTRL_REGS_H
#define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs" #define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs"

View File

@ -9,8 +9,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef IMX2_WDT_H #ifndef WDT_IMX2_H
#define IMX2_WDT_H #define WDT_IMX2_H
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
@ -88,4 +88,4 @@ struct IMX2WdtState {
bool wcr_wdt_locked; /* affects WDT (never cleared) */ bool wcr_wdt_locked; /* affects WDT (never cleared) */
}; };
#endif /* IMX2_WDT_H */ #endif /* WDT_IMX2_H */

View File

@ -1,5 +1,5 @@
#ifndef QEMU_COMMON_H #ifndef QEMU_HELP_TEXTS_H
#define QEMU_COMMON_H #define QEMU_HELP_TEXTS_H
/* Copyright string for -version arguments, About dialogs, etc */ /* Copyright string for -version arguments, About dialogs, etc */
#define QEMU_COPYRIGHT "Copyright (c) 2003-2022 " \ #define QEMU_COPYRIGHT "Copyright (c) 2003-2022 " \

View File

@ -7,8 +7,9 @@
* *
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef QEMU_PLUGIN_API_H
#define QEMU_PLUGIN_API_H #ifndef QEMU_QEMU_PLUGIN_H
#define QEMU_QEMU_PLUGIN_H
#include <inttypes.h> #include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
@ -624,4 +625,4 @@ uint64_t qemu_plugin_end_code(void);
*/ */
uint64_t qemu_plugin_entry_code(void); uint64_t qemu_plugin_entry_code(void);
#endif /* QEMU_PLUGIN_API_H */ #endif /* QEMU_QEMU_PLUGIN_H */

View File

@ -10,8 +10,8 @@
* or later. See the COPYING.LIB file in the top-level directory. * or later. See the COPYING.LIB file in the top-level directory.
*/ */
#ifndef BLOCK_BACKEND_GS_H #ifndef BLOCK_BACKEND_GLOBAL_STATE_H
#define BLOCK_BACKEND_GS_H #define BLOCK_BACKEND_GLOBAL_STATE_H
#include "block-backend-common.h" #include "block-backend-common.h"
@ -113,4 +113,4 @@ const BdrvChild *blk_root(BlockBackend *blk);
int blk_make_empty(BlockBackend *blk, Error **errp); int blk_make_empty(BlockBackend *blk, Error **errp);
#endif /* BLOCK_BACKEND_GS_H */ #endif /* BLOCK_BACKEND_GLOBAL_STATE_H */

View File

@ -9,8 +9,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef PLUGIN_INTERNAL_H #ifndef PLUGIN_H
#define PLUGIN_INTERNAL_H #define PLUGIN_H
#include <gmodule.h> #include <gmodule.h>
#include "qemu/qht.h" #include "qemu/qht.h"
@ -97,4 +97,4 @@ void plugin_register_vcpu_mem_cb(GArray **arr,
void exec_inline_op(struct qemu_plugin_dyn_cb *cb); void exec_inline_op(struct qemu_plugin_dyn_cb *cb);
#endif /* _PLUGIN_INTERNAL_H_ */ #endif /* PLUGIN_H */

View File

@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TARGET_ARM_TRANSLATE_A64_H #ifndef TARGET_ARM_TRANSLATE_A32_H
#define TARGET_ARM_TRANSLATE_A64_H #define TARGET_ARM_TRANSLATE_A32_H
/* Prototypes for autogenerated disassembler functions */ /* Prototypes for autogenerated disassembler functions */
bool disas_m_nocp(DisasContext *dc, uint32_t insn); bool disas_m_nocp(DisasContext *dc, uint32_t insn);

View File

@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef TARGET_ARM_VEC_INTERNALS_H #ifndef TARGET_ARM_VEC_INTERNAL_H
#define TARGET_ARM_VEC_INTERNALS_H #define TARGET_ARM_VEC_INTERNAL_H
/* /*
* Note that vector data is stored in host-endian 64-bit chunks, * Note that vector data is stored in host-endian 64-bit chunks,
@ -217,4 +217,4 @@ uint64_t pmull_h(uint64_t op1, uint64_t op2);
*/ */
uint64_t pmull_w(uint64_t op1, uint64_t op2); uint64_t pmull_w(uint64_t op1, uint64_t op2);
#endif /* TARGET_ARM_VEC_INTERNALS_H */ #endif /* TARGET_ARM_VEC_INTERNAL_H */

View File

@ -18,8 +18,8 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html> * <http://www.gnu.org/licenses/lgpl-2.1.html>
*/ */
#ifndef QEMU_AVR_QOM_H #ifndef TARGET_AVR_CPU_QOM_H
#define QEMU_AVR_QOM_H #define TARGET_AVR_CPU_QOM_H
#include "hw/core/cpu.h" #include "hw/core/cpu.h"
#include "qom/object.h" #include "qom/object.h"
@ -44,4 +44,4 @@ struct AVRCPUClass {
}; };
#endif /* !defined (QEMU_AVR_CPU_QOM_H) */ #endif /* TARGET_AVR_CPU_QOM_H */

View File

@ -15,8 +15,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef HEXAGON_ARCH_TYPES_H #ifndef HEXAGON_HEX_ARCH_TYPES_H
#define HEXAGON_ARCH_TYPES_H #define HEXAGON_HEX_ARCH_TYPES_H
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "mmvec/mmvec.h" #include "mmvec/mmvec.h"

View File

@ -15,8 +15,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef HEXAGON_REGS_H #ifndef HEXAGON_HEX_REGS_H
#define HEXAGON_REGS_H #define HEXAGON_HEX_REGS_H
enum { enum {
HEX_REG_R00 = 0, HEX_REG_R00 = 0,

View File

@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef HAX_CPUS_H #ifndef TARGET_I386_HAX_ACCEL_OPS_H
#define HAX_CPUS_H #define TARGET_I386_HAX_ACCEL_OPS_H
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
@ -28,4 +28,4 @@ int hax_vcpu_destroy(CPUState *cpu);
void hax_raise_event(CPUState *cpu); void hax_raise_event(CPUState *cpu);
void hax_reset_vcpu_state(void *opaque); void hax_reset_vcpu_state(void *opaque);
#endif /* HAX_CPUS_H */ #endif /* TARGET_I386_HAX_ACCEL_OPS_H */

View File

@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef NVMM_CPUS_H #ifndef TARGET_I386_NVMM_ACCEL_OPS_H
#define NVMM_CPUS_H #define TARGET_I386_NVMM_ACCEL_OPS_H
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
@ -21,4 +21,4 @@ void nvmm_cpu_synchronize_post_reset(CPUState *cpu);
void nvmm_cpu_synchronize_post_init(CPUState *cpu); void nvmm_cpu_synchronize_post_init(CPUState *cpu);
void nvmm_cpu_synchronize_pre_loadvm(CPUState *cpu); void nvmm_cpu_synchronize_pre_loadvm(CPUState *cpu);
#endif /* NVMM_CPUS_H */ #endif /* TARGET_I386_NVMM_ACCEL_OPS_H */

View File

@ -11,8 +11,8 @@
* *
*/ */
#ifndef QEMU_SEV_I386_H #ifndef I386_SEV_H
#define QEMU_SEV_I386_H #define I386_SEV_H
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
#include CONFIG_DEVICES /* CONFIG_SEV */ #include CONFIG_DEVICES /* CONFIG_SEV */

View File

@ -7,8 +7,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef WHPX_CPUS_H #ifndef TARGET_I386_WHPX_ACCEL_OPS_H
#define WHPX_CPUS_H #define TARGET_I386_WHPX_ACCEL_OPS_H
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
@ -30,4 +30,4 @@ void whpx_cpu_synchronize_pre_resume(bool step_pending);
/* full state set, modified during initialization or on vmload */ /* full state set, modified during initialization or on vmload */
#define WHPX_SET_FULL_STATE 3 #define WHPX_SET_FULL_STATE 3
#endif /* WHPX_CPUS_H */ #endif /* TARGET_I386_WHPX_ACCEL_OPS_H */

View File

@ -1,5 +1,5 @@
#ifndef WHP_INTERNAL_H #ifndef TARGET_I386_WHPX_INTERNAL_H
#define WHP_INTERNAL_H #define TARGET_I386_WHPX_INTERNAL_H
#include <windows.h> #include <windows.h>
#include <WinHvPlatform.h> #include <WinHvPlatform.h>
@ -116,4 +116,4 @@ typedef enum WHPFunctionList {
WINHV_PLATFORM_FNS_SUPPLEMENTAL WINHV_PLATFORM_FNS_SUPPLEMENTAL
} WHPFunctionList; } WHPFunctionList;
#endif /* WHP_INTERNAL_H */ #endif /* TARGET_I386_WHPX_INTERNAL_H */

View File

@ -28,8 +28,8 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#ifndef XTENSA_CORE_CONFIGURATION_H_ #ifndef XTENSA_CORE_DE233_FPU_CORE_ISA_H
#define XTENSA_CORE_CONFIGURATION_H_ #define XTENSA_CORE_DE233_FPU_CORE_ISA_H
//depot/dev/Homewood/Xtensa/SWConfig/hal/core-common.h.tph#24 - edit change 444323 (text+ko) //depot/dev/Homewood/Xtensa/SWConfig/hal/core-common.h.tph#24 - edit change 444323 (text+ko)
@ -723,5 +723,4 @@
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
#endif /* XTENSA_CORE_CONFIGURATION_H_ */ #endif /* XTENSA_CORE_DE233_FPU_CORE_ISA_H */

View File

@ -28,9 +28,8 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#ifndef _XTENSA_CORE_CONFIGURATION_H #ifndef XTENSA_CORE_DSP3400_CORE_ISA_H
#define _XTENSA_CORE_CONFIGURATION_H #define XTENSA_CORE_DSP3400_CORE_ISA_H
/**************************************************************************** /****************************************************************************
Parameters Useful for Any Code, USER or PRIVILEGED Parameters Useful for Any Code, USER or PRIVILEGED
@ -448,5 +447,4 @@
#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */ #endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
#endif /* _XTENSA_CORE_CONFIGURATION_H */ #endif /* XTENSA_CORE_DSP3400_CORE_ISA_H */

View File

@ -11,8 +11,8 @@
* *
*/ */
#ifndef FUZZER_H_ #ifndef QTEST_FUZZ_H
#define FUZZER_H_ #define QTEST_FUZZ_H
#include "qemu/units.h" #include "qemu/units.h"
#include "qapi/error.h" #include "qapi/error.h"
@ -122,4 +122,3 @@ int LLVMFuzzerTestOneInput(const unsigned char *Data, size_t Size);
int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp); int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp);
#endif #endif

View File

@ -6,10 +6,9 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef VIRTIOFSD_SECCOMP_H #ifndef VIRTIOFSD_PASSTHROUGH_SECCOMP_H
#define VIRTIOFSD_SECCOMP_H #define VIRTIOFSD_PASSTHROUGH_SECCOMP_H
void setup_seccomp(bool enable_syslog); void setup_seccomp(bool enable_syslog);
#endif /* VIRTIOFSD_SECCOMP_H */ #endif /* VIRTIOFSD_PASSTHROUGH_SECCOMP_H */