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]
2025-08-04 08:13:54 -06:00 · 2022-05-06 15:49:08 +02:00 · 2022-05-06 15:49:08 +02:00 · 52581c718c
commit 52581c718c
parent 178bacb66d
58 changed files with 148 additions and 151 deletions
--- a/include/hw/acpi/generic_event_device.h
+++ b/include/hw/acpi/generic_event_device.h
@ -56,8 +56,8 @@
 *
 */

-#ifndef HW_ACPI_GED_H
-#define HW_ACPI_GED_H
+#ifndef HW_ACPI_GENERIC_EVENT_DEVICE_H
+#define HW_ACPI_GENERIC_EVENT_DEVICE_H

 #include "hw/sysbus.h"
 #include "hw/acpi/memory_hotplug.h"
--- a/include/hw/i2c/arm_sbcon_i2c.h
+++ b/include/hw/i2c/arm_sbcon_i2c.h
@ -9,8 +9,9 @@
 *
 * 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/i2c/bitbang_i2c.h"
@ -34,4 +35,4 @@ struct ArmSbconI2CState {
    int in;
 };

-#endif /* HW_I2C_ARM_SBCON_H */
+#endif /* HW_I2C_ARM_SBCON_I2C_H */
--- a/include/hw/misc/bcm2835_cprman.h
+++ b/include/hw/misc/bcm2835_cprman.h
@ -6,8 +6,8 @@
 * SPDX-License-Identifier: GPL-2.0-or-later
 */

-#ifndef HW_MISC_CPRMAN_H
-#define HW_MISC_CPRMAN_H
+#ifndef HW_MISC_BCM2835_CPRMAN_H
+#define HW_MISC_BCM2835_CPRMAN_H

 #include "hw/sysbus.h"
 #include "hw/qdev-clock.h"
--- a/include/hw/misc/bcm2835_cprman_internals.h
+++ b/include/hw/misc/bcm2835_cprman_internals.h
@ -6,8 +6,8 @@
 * SPDX-License-Identifier: GPL-2.0-or-later
 */

-#ifndef HW_MISC_CPRMAN_INTERNALS_H
-#define HW_MISC_CPRMAN_INTERNALS_H
+#ifndef HW_MISC_BCM2835_CPRMAN_INTERNALS_H
+#define HW_MISC_BCM2835_CPRMAN_INTERNALS_H

 #include "hw/registerfields.h"
 #include "hw/misc/bcm2835_cprman.h"
--- a/include/hw/misc/stm32f4xx_exti.h
+++ b/include/hw/misc/stm32f4xx_exti.h
@ -22,8 +22,8 @@
 * THE SOFTWARE.
 */

-#ifndef HW_STM_EXTI_H
-#define HW_STM_EXTI_H
+#ifndef HW_STM32F4XX_EXTI_H
+#define HW_STM32F4XX_EXTI_H

 #include "hw/sysbus.h"
 #include "qom/object.h"
--- a/include/hw/misc/stm32f4xx_syscfg.h
+++ b/include/hw/misc/stm32f4xx_syscfg.h
@ -22,8 +22,8 @@
 * THE SOFTWARE.
 */

-#ifndef HW_STM_SYSCFG_H
-#define HW_STM_SYSCFG_H
+#ifndef HW_STM32F4XX_SYSCFG_H
+#define HW_STM32F4XX_SYSCFG_H

 #include "hw/sysbus.h"
 #include "qom/object.h"
--- a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h
+++ b/include/hw/misc/xlnx-versal-pmc-iou-slcr.h
@ -51,8 +51,8 @@
 *   1: OSPI direct access mode.
 */

-#ifndef XILINX_VERSAL_PMC_IOU_SLCR_H
-#define XILINX_VERSAL_PMC_IOU_SLCR_H
+#ifndef XLNX_VERSAL_PMC_IOU_SLCR_H
+#define XLNX_VERSAL_PMC_IOU_SLCR_H

 #include "hw/register.h"

@ -75,4 +75,4 @@ struct XlnxVersalPmcIouSlcr {
    RegisterInfo regs_info[XILINX_VERSAL_PMC_IOU_SLCR_R_MAX];
 };

-#endif /* XILINX_VERSAL_PMC_IOU_SLCR_H */
+#endif /* XLNX_VERSAL_PMC_IOU_SLCR_H */
--- a/include/hw/net/mv88w8618_eth.h
+++ b/include/hw/net/mv88w8618_eth.h
@ -4,8 +4,9 @@
 *
 * 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"

--- a/include/hw/nubus/mac-nubus-bridge.h
+++ b/include/hw/nubus/mac-nubus-bridge.h
@ -6,8 +6,8 @@
 *
 */

-#ifndef HW_NUBUS_MAC_H
-#define HW_NUBUS_MAC_H
+#ifndef HW_NUBUS_MAC_NUBUS_BRIDGE_H
+#define HW_NUBUS_MAC_NUBUS_BRIDGE_H

 #include "hw/nubus/nubus.h"
 #include "qom/object.h"
--- a/include/hw/pci-host/remote.h
+++ b/include/hw/pci-host/remote.h
@ -8,8 +8,8 @@
 *
 */

-#ifndef REMOTE_PCIHOST_H
-#define REMOTE_PCIHOST_H
+#ifndef PCI_HOST_REMOTE_H
+#define PCI_HOST_REMOTE_H

 #include "exec/memory.h"
 #include "hw/pci/pcie_host.h"
--- a/include/hw/riscv/boot_opensbi.h
+++ b/include/hw/riscv/boot_opensbi.h
@ -4,8 +4,9 @@
 *
 * 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) */
 #define FW_DYNAMIC_INFO_MAGIC_VALUE     0x4942534f
--- a/include/hw/riscv/shakti_c.h
+++ b/include/hw/riscv/shakti_c.h
@ -16,8 +16,8 @@
 * this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef HW_SHAKTI_H
-#define HW_SHAKTI_H
+#ifndef HW_SHAKTI_C_H
+#define HW_SHAKTI_C_H

 #include "hw/riscv/riscv_hart.h"
 #include "hw/boards.h"
--- a/include/hw/rtc/sun4v-rtc.h
+++ b/include/hw/rtc/sun4v-rtc.h
@ -9,8 +9,8 @@
 * version.
 */

-#ifndef HW_RTC_SUN4V
-#define HW_RTC_SUN4V
+#ifndef HW_RTC_SUN4V_RTC_H
+#define HW_RTC_SUN4V_RTC_H

 #include "exec/hwaddr.h"

--- a/include/hw/rtc/xlnx-zynqmp-rtc.h
+++ b/include/hw/rtc/xlnx-zynqmp-rtc.h
@ -24,8 +24,8 @@
 * THE SOFTWARE.
 */

-#ifndef HW_RTC_XLNX_ZYNQMP_H
-#define HW_RTC_XLNX_ZYNQMP_H
+#ifndef HW_RTC_XLNX_ZYNQMP_RTC_H
+#define HW_RTC_XLNX_ZYNQMP_RTC_H

 #include "hw/register.h"
 #include "hw/sysbus.h"
--- a/include/hw/rx/rx62n.h
+++ b/include/hw/rx/rx62n.h
@ -21,8 +21,8 @@
 * this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef HW_RX_RX62N_MCU_H
-#define HW_RX_RX62N_MCU_H
+#ifndef HW_RX_RX62N_H
+#define HW_RX_RX62N_H

 #include "target/rx/cpu.h"
 #include "hw/intc/rx_icu.h"
--- a/include/hw/sensor/emc141x_regs.h
+++ b/include/hw/sensor/emc141x_regs.h
@ -9,8 +9,8 @@
 * later. See the COPYING file in the top-level directory.
 */

-#ifndef TMP105_REGS_H
-#define TMP105_REGS_H
+#ifndef EMC141X_REGS_H
+#define EMC141X_REGS_H

 #define EMC1413_DEVICE_ID                0x21
 #define EMC1414_DEVICE_ID                0x25
--- a/include/hw/ssi/xlnx-versal-ospi.h
+++ b/include/hw/ssi/xlnx-versal-ospi.h
@ -49,8 +49,8 @@
 * + Property "indac-write-disabled": Disable indirect access writes.
 */

-#ifndef XILINX_VERSAL_OSPI_H
-#define XILINX_VERSAL_OSPI_H
+#ifndef XLNX_VERSAL_OSPI_H
+#define XLNX_VERSAL_OSPI_H

 #include "hw/register.h"
 #include "hw/ssi/ssi.h"
@ -108,4 +108,4 @@ struct XlnxVersalOspi {
    uint8_t stig_membank[512];
 };

-#endif /* XILINX_VERSAL_OSPI_H */
+#endif /* XLNX_VERSAL_OSPI_H */
--- a/include/hw/timer/bcm2835_systmr.h
+++ b/include/hw/timer/bcm2835_systmr.h
@ -6,8 +6,8 @@
 * SPDX-License-Identifier: GPL-2.0-or-later
 */

-#ifndef BCM2835_SYSTIMER_H
-#define BCM2835_SYSTIMER_H
+#ifndef BCM2835_SYSTMR_H
+#define BCM2835_SYSTMR_H

 #include "hw/sysbus.h"
 #include "hw/irq.h"
--- a/include/hw/tricore/tricore_testdevice.h
+++ b/include/hw/tricore/tricore_testdevice.h
@ -15,9 +15,8 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-
-#ifndef HW_TRICORE_TESTDEV_H
-#define HW_TRICORE_TESTDEV_H
+#ifndef HW_TRICORE_TESTDEVICE_H
+#define HW_TRICORE_TESTDEVICE_H

 #include "hw/sysbus.h"
 #include "hw/hw.h"
--- a/include/hw/usb/dwc2-regs.h
+++ b/include/hw/usb/dwc2-regs.h
@ -39,8 +39,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef DWC2_HW_H
-#define DWC2_HW_H
+#ifndef DWC2_REGS_H
+#define DWC2_REGS_H

 #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_HS_ISOC	256

-#endif /* __DWC2_HW_H__ */
+#endif /* DWC2_REGS_H */
--- a/include/hw/usb/hcd-musb.h
+++ b/include/hw/usb/hcd-musb.h
@ -10,8 +10,8 @@
 * SPDX-License-Identifier: GPL-2.0-or-later
 */

-#ifndef HW_USB_MUSB_H
-#define HW_USB_MUSB_H
+#ifndef HW_USB_HCD_MUSB_H
+#define HW_USB_HCD_MUSB_H

 enum musb_irq_source_e {
    musb_irq_suspend = 0,
--- a/include/hw/usb/xlnx-usb-subsystem.h
+++ b/include/hw/usb/xlnx-usb-subsystem.h
@ -22,8 +22,8 @@
 * THE SOFTWARE.
 */

-#ifndef XLNX_VERSAL_USB_SUBSYSTEM_H
-#define XLNX_VERSAL_USB_SUBSYSTEM_H
+#ifndef XLNX_USB_SUBSYSTEM_H
+#define XLNX_USB_SUBSYSTEM_H

 #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h"
 #include "hw/usb/hcd-dwc3.h"
--- a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h
+++ b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h
@ -23,8 +23,8 @@
 * THE SOFTWARE.
 */

-#ifndef XLNX_USB2_REGS_H
-#define XLNX_USB2_REGS_H
+#ifndef XLNX_VERSAL_USB2_CTRL_REGS_H
+#define XLNX_VERSAL_USB2_CTRL_REGS_H

 #define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs"

--- a/include/hw/watchdog/wdt_imx2.h
+++ b/include/hw/watchdog/wdt_imx2.h
@ -9,8 +9,8 @@
 * See the COPYING file in the top-level directory.
 */

-#ifndef IMX2_WDT_H
-#define IMX2_WDT_H
+#ifndef WDT_IMX2_H
+#define WDT_IMX2_H

 #include "qemu/bitops.h"
 #include "hw/sysbus.h"
@ -88,4 +88,4 @@ struct IMX2WdtState {
    bool wcr_wdt_locked;        /* affects WDT (never cleared) */
 };

-#endif /* IMX2_WDT_H */
+#endif /* WDT_IMX2_H */