Re: [Qemu-devel] [PATCH 8/8] Clean up decorations and whitespace around header guards

[Alistair Francis]

On Fri, Mar 15, 2019 at 4:54 AM Markus Armbruster <address@hidden> wrote:
>
> Cleaned up with scripts/clean-header-guards.pl.
>
> Signed-off-by: Markus Armbruster <address@hidden>

For the RISC-V part:

Reviewed-by: Alistair Francis <address@hidden>

Alistair

> ---
>  hw/ide/ahci_internal.h              | 2 +-
>  include/block/aio-wait.h            | 2 +-
>  include/exec/translator.h           | 2 +-
>  include/hw/arm/nrf51_soc.h          | 1 -
>  include/hw/arm/smmu-common.h        | 2 +-
>  include/hw/misc/imx2_wdt.h          | 2 +-
>  include/hw/misc/nrf51_rng.h         | 3 ++-
>  include/hw/pci-host/designware.h    | 2 +-
>  include/hw/riscv/sifive_plic.h      | 1 -
>  include/qemu/pmem.h                 | 2 +-
>  target/xtensa/xtensa-isa-internal.h | 2 +-
>  tests/acpi-utils.h                  | 2 +-
>  tests/tpm-emu.h                     | 2 +-
>  13 files changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h
> index 9b7fa8fc7d..95ecddcd3c 100644
> --- a/hw/ide/ahci_internal.h
> +++ b/hw/ide/ahci_internal.h
> @@ -394,4 +394,4 @@ void ahci_reset(AHCIState *s);
>
>  #define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), 
> TYPE_SYSBUS_AHCI)
>
> -#endif /* HW_IDE_AHCI_H */
> +#endif /* HW_IDE_AHCI_INTERNAL_H */
> diff --git a/include/block/aio-wait.h b/include/block/aio-wait.h
> index afd0ff7eb8..afeeb18f95 100644
> --- a/include/block/aio-wait.h
> +++ b/include/block/aio-wait.h
> @@ -124,4 +124,4 @@ void aio_wait_kick(void);
>   */
>  void aio_wait_bh_oneshot(AioContext *ctx, QEMUBHFunc *cb, void *opaque);
>
> -#endif /* QEMU_AIO_WAIT */
> +#endif /* QEMU_AIO_WAIT_H */
> diff --git a/include/exec/translator.h b/include/exec/translator.h
> index 71e7b2c347..f327242576 100644
> --- a/include/exec/translator.h
> +++ b/include/exec/translator.h
> @@ -141,4 +141,4 @@ void translator_loop(const TranslatorOps *ops, 
> DisasContextBase *db,
>
>  void translator_loop_temp_check(DisasContextBase *db);
>
> -#endif  /* EXEC__TRANSLATOR_H */
> +#endif /* EXEC__TRANSLATOR_H */
> diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h
> index fd7fcc71a5..0cb78aafea 100644
> --- a/include/hw/arm/nrf51_soc.h
> +++ b/include/hw/arm/nrf51_soc.h
> @@ -53,4 +53,3 @@ typedef struct NRF51State {
>  } NRF51State;
>
>  #endif
> -
> diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h
> index b07cadd0ef..9a6ac64c97 100644
> --- a/include/hw/arm/smmu-common.h
> +++ b/include/hw/arm/smmu-common.h
> @@ -167,4 +167,4 @@ void smmu_inv_notifiers_all(SMMUState *s);
>  /* Unmap the range of all the notifiers registered to @mr */
>  void smmu_inv_notifiers_mr(IOMMUMemoryRegion *mr);
>
> -#endif  /* HW_ARM_SMMU_COMMON */
> +#endif /* HW_ARM_SMMU_COMMON_H */
> diff --git a/include/hw/misc/imx2_wdt.h b/include/hw/misc/imx2_wdt.h
> index 8afc99a10e..b91b002528 100644
> --- a/include/hw/misc/imx2_wdt.h
> +++ b/include/hw/misc/imx2_wdt.h
> @@ -30,4 +30,4 @@ typedef struct IMX2WdtState {
>      MemoryRegion mmio;
>  } IMX2WdtState;
>
> -#endif /* IMX7_SNVS_H */
> +#endif /* IMX2_WDT_H */
> diff --git a/include/hw/misc/nrf51_rng.h b/include/hw/misc/nrf51_rng.h
> index 3d6bf79997..b0133bf665 100644
> --- a/include/hw/misc/nrf51_rng.h
> +++ b/include/hw/misc/nrf51_rng.h
> @@ -30,6 +30,7 @@
>   * the COPYING file in the top-level directory.
>   *
>   */
> +
>  #ifndef NRF51_RNG_H
>  #define NRF51_RNG_H
>
> @@ -80,4 +81,4 @@ typedef struct {
>  } NRF51RNGState;
>
>
> -#endif /* NRF51_RNG_H_ */
> +#endif /* NRF51_RNG_H */
> diff --git a/include/hw/pci-host/designware.h 
> b/include/hw/pci-host/designware.h
> index a4f2c0695b..186bb36238 100644
> --- a/include/hw/pci-host/designware.h
> +++ b/include/hw/pci-host/designware.h
> @@ -99,4 +99,4 @@ typedef struct DesignwarePCIEHost {
>      MemoryRegion mmio;
>  } DesignwarePCIEHost;
>
> -#endif  /* DESIGNWARE_H */
> +#endif /* DESIGNWARE_H */
> diff --git a/include/hw/riscv/sifive_plic.h b/include/hw/riscv/sifive_plic.h
> index 688cd97f82..ce8907f6aa 100644
> --- a/include/hw/riscv/sifive_plic.h
> +++ b/include/hw/riscv/sifive_plic.h
> @@ -80,4 +80,3 @@ DeviceState *sifive_plic_create(hwaddr addr, char 
> *hart_config,
>      uint32_t aperture_size);
>
>  #endif
> -
> diff --git a/include/qemu/pmem.h b/include/qemu/pmem.h
> index dfb6d0da62..d2d7ad085c 100644
> --- a/include/qemu/pmem.h
> +++ b/include/qemu/pmem.h
> @@ -33,4 +33,4 @@ pmem_persist(const void *addr, size_t len)
>
>  #endif /* CONFIG_LIBPMEM */
>
> -#endif /* !QEMU_PMEM_H */
> +#endif /* QEMU_PMEM_H */
> diff --git a/target/xtensa/xtensa-isa-internal.h 
> b/target/xtensa/xtensa-isa-internal.h
> index c29295ff96..40dd8bac96 100644
> --- a/target/xtensa/xtensa-isa-internal.h
> +++ b/target/xtensa/xtensa-isa-internal.h
> @@ -228,4 +228,4 @@ int xtensa_isa_name_compare(const void *, const void *);
>  extern xtensa_isa_status xtisa_errno;
>  extern char xtisa_error_msg[];
>
> -#endif /* !XTENSA_ISA_INTERNAL_H */
> +#endif /* XTENSA_ISA_INTERNAL_H */
> diff --git a/tests/acpi-utils.h b/tests/acpi-utils.h
> index ef388bbf12..73fe24f044 100644
> --- a/tests/acpi-utils.h
> +++ b/tests/acpi-utils.h
> @@ -52,4 +52,4 @@ void acpi_fetch_table(QTestState *qts, uint8_t **aml, 
> uint32_t *aml_len,
>                        const uint8_t *addr_ptr, const char *sig,
>                        bool verify_checksum);
>
> -#endif  /* TEST_ACPI_UTILS_H */
> +#endif /* TEST_ACPI_UTILS_H */
> diff --git a/tests/tpm-emu.h b/tests/tpm-emu.h
> index 8eb802a79e..a4f1d64226 100644
> --- a/tests/tpm-emu.h
> +++ b/tests/tpm-emu.h
> @@ -36,4 +36,4 @@ typedef struct TestState {
>  void tpm_emu_test_wait_cond(TestState *s);
>  void *tpm_emu_ctrl_thread(void *data);
>
> -#endif /* TEST_TPM_EMU_H */
> +#endif /* TESTS_TPM_EMU_H */
> --
> 2.17.2
>
>