From: David Hildenbrand <david@redhat.com>
To: Cornelia Huck <cohuck@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Thomas Huth <thuth@redhat.com>, Andrew Jones <drjones@redhat.com>
Cc: kvm@vger.kernel.org, Laurent Vivier <lvivier@redhat.com>,
Janosch Frank <frankja@linux.ibm.com>,
Claudio Imbrenda <imbrenda@linux.ibm.com>,
kvmarm@lists.cs.columbia.edu, kvm-ppc@vger.kernel.org,
linux-s390@vger.kernel.org
Subject: Re: [kvm-unit-tests PATCH v2 7/7] x86: unify header guards
Date: Wed, 9 Jun 2021 16:49:50 +0200 [thread overview]
Message-ID: <661ee535-bdac-aa1d-7b29-a271f698e778@redhat.com> (raw)
In-Reply-To: <20210609143712.60933-8-cohuck@redhat.com>
On 09.06.21 16:37, Cornelia Huck wrote:
> Standardize header guards to _ASMX86_HEADER_H_, _X86_HEADER_H_,
> and X86_HEADER_H.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> lib/x86/acpi.h | 4 ++--
> lib/x86/apic-defs.h | 6 +++---
> lib/x86/apic.h | 4 ++--
> lib/x86/asm/barrier.h | 4 ++--
> lib/x86/asm/debugreg.h | 6 +++---
> lib/x86/asm/io.h | 4 ++--
> lib/x86/asm/memory_areas.h | 4 ++--
> lib/x86/asm/page.h | 4 ++--
> lib/x86/asm/pci.h | 4 ++--
> lib/x86/asm/spinlock.h | 4 ++--
> lib/x86/asm/stack.h | 4 ++--
> lib/x86/atomic.h | 4 ++--
> lib/x86/delay.h | 4 ++--
> lib/x86/desc.h | 4 ++--
> lib/x86/fault_test.h | 4 ++--
> lib/x86/fwcfg.h | 4 ++--
> lib/x86/intel-iommu.h | 4 ++--
> lib/x86/isr.h | 4 ++--
> lib/x86/msr.h | 6 +++---
> lib/x86/processor.h | 4 ++--
> lib/x86/smp.h | 4 ++--
> lib/x86/usermode.h | 4 ++--
> lib/x86/vm.h | 4 ++--
> x86/hyperv.h | 4 ++--
> x86/ioram.h | 4 ++--
> x86/kvmclock.h | 4 ++--
> x86/svm.h | 4 ++--
> x86/types.h | 4 ++--
> x86/vmx.h | 4 ++--
> 29 files changed, 61 insertions(+), 61 deletions(-)
>
> diff --git a/lib/x86/acpi.h b/lib/x86/acpi.h
> index 08aaf57a7890..1b803740f331 100644
> --- a/lib/x86/acpi.h
> +++ b/lib/x86/acpi.h
> @@ -1,5 +1,5 @@
> -#ifndef KVM_ACPI_H
> -#define KVM_ACPI_H 1
> +#ifndef _X86_ACPI_H_
> +#define _X86_ACPI_H_
>
> #include "libcflat.h"
>
> diff --git a/lib/x86/apic-defs.h b/lib/x86/apic-defs.h
> index b2014de800a7..dabefe7879ea 100644
> --- a/lib/x86/apic-defs.h
> +++ b/lib/x86/apic-defs.h
> @@ -1,5 +1,5 @@
> -#ifndef _ASM_X86_APICDEF_H
> -#define _ASM_X86_APICDEF_H
> +#ifndef _X86_APIC_DEFS_H_
> +#define _X86_APIC_DEFS_H_
>
> /*
> * Abuse this header file to hold the number of max-cpus, making it available
> @@ -144,4 +144,4 @@
>
> #define APIC_BASE_MSR 0x800
>
> -#endif /* _ASM_X86_APICDEF_H */
> +#endif /* _X86_APIC_DEFS_H_ */
> diff --git a/lib/x86/apic.h b/lib/x86/apic.h
> index a7eff6354a83..c4821716b352 100644
> --- a/lib/x86/apic.h
> +++ b/lib/x86/apic.h
> @@ -1,5 +1,5 @@
> -#ifndef CFLAT_APIC_H
> -#define CFLAT_APIC_H
> +#ifndef _X86_APIC_H_
> +#define _X86_APIC_H_
>
> #include <stdint.h>
> #include "apic-defs.h"
> diff --git a/lib/x86/asm/barrier.h b/lib/x86/asm/barrier.h
> index 193fb4c2e712..66c8f56f1c9a 100644
> --- a/lib/x86/asm/barrier.h
> +++ b/lib/x86/asm/barrier.h
> @@ -1,5 +1,5 @@
> -#ifndef _ASM_X86_BARRIER_H_
> -#define _ASM_X86_BARRIER_H_
> +#ifndef _ASMX86_BARRIER_H_
> +#define _ASMX86_BARRIER_H_
> /*
> * Copyright (C) 2016, Red Hat Inc, Alexander Gordeev <agordeev@redhat.com>
> *
> diff --git a/lib/x86/asm/debugreg.h b/lib/x86/asm/debugreg.h
> index d95d080b30e3..e86f5a629480 100644
> --- a/lib/x86/asm/debugreg.h
> +++ b/lib/x86/asm/debugreg.h
> @@ -1,6 +1,6 @@
> /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -#ifndef _UAPI_ASM_X86_DEBUGREG_H
> -#define _UAPI_ASM_X86_DEBUGREG_H
> +#ifndef _ASMX86_DEBUGREG_H_
> +#define _ASMX86_DEBUGREG_H_
>
>
> /* Indicate the register numbers for a number of the specific
> @@ -78,4 +78,4 @@
> * HW breakpoint additions
> */
>
> -#endif /* _UAPI_ASM_X86_DEBUGREG_H */
> +#endif /* _ASMX86_DEBUGREG_H_ */
> diff --git a/lib/x86/asm/io.h b/lib/x86/asm/io.h
> index 35a5c7347411..88734320aa93 100644
> --- a/lib/x86/asm/io.h
> +++ b/lib/x86/asm/io.h
> @@ -1,5 +1,5 @@
> -#ifndef _ASM_X86_IO_H_
> -#define _ASM_X86_IO_H_
> +#ifndef _ASMX86_IO_H_
> +#define _ASMX86_IO_H_
>
> #define __iomem
>
> diff --git a/lib/x86/asm/memory_areas.h b/lib/x86/asm/memory_areas.h
> index e84016f8b060..bd47a89aba7d 100644
> --- a/lib/x86/asm/memory_areas.h
> +++ b/lib/x86/asm/memory_areas.h
> @@ -1,5 +1,5 @@
> -#ifndef _ASM_X86_MEMORY_AREAS_H_
> -#define _ASM_X86_MEMORY_AREAS_H_
> +#ifndef _ASMX86_MEMORY_AREAS_H_
> +#define _ASMX86_MEMORY_AREAS_H_
>
> #define AREA_NORMAL_PFN BIT(36-12)
> #define AREA_NORMAL_NUMBER 0
> diff --git a/lib/x86/asm/page.h b/lib/x86/asm/page.h
> index 2cf8881e16d2..fc1416071ec9 100644
> --- a/lib/x86/asm/page.h
> +++ b/lib/x86/asm/page.h
> @@ -1,5 +1,5 @@
> -#ifndef _ASM_X86_PAGE_H_
> -#define _ASM_X86_PAGE_H_
> +#ifndef _ASMX86_PAGE_H_
> +#define _ASMX86_PAGE_H_
> /*
> * Copyright (C) 2016, Red Hat Inc, Alexander Gordeev <agordeev@redhat.com>
> *
> diff --git a/lib/x86/asm/pci.h b/lib/x86/asm/pci.h
> index c937e5cd71e1..03e55c277f12 100644
> --- a/lib/x86/asm/pci.h
> +++ b/lib/x86/asm/pci.h
> @@ -1,5 +1,5 @@
> -#ifndef ASM_PCI_H
> -#define ASM_PCI_H
> +#ifndef _ASMX86_PCI_H_
> +#define _ASMX86_PCI_H_
> /*
> * Copyright (C) 2013, Red Hat Inc, Michael S. Tsirkin <mst@redhat.com>
> *
> diff --git a/lib/x86/asm/spinlock.h b/lib/x86/asm/spinlock.h
> index 692020c5185c..34fadf771c11 100644
> --- a/lib/x86/asm/spinlock.h
> +++ b/lib/x86/asm/spinlock.h
> @@ -1,5 +1,5 @@
> -#ifndef __ASM_SPINLOCK_H
> -#define __ASM_SPINLOCK_H
> +#ifndef _ASMX86_SPINLOCK_H_
> +#define _ASMX86_SPINLOCK_H_
>
> #include <asm-generic/spinlock.h>
>
> diff --git a/lib/x86/asm/stack.h b/lib/x86/asm/stack.h
> index b14e2c0fa012..417695373801 100644
> --- a/lib/x86/asm/stack.h
> +++ b/lib/x86/asm/stack.h
> @@ -1,5 +1,5 @@
> -#ifndef _X86ASM_STACK_H_
> -#define _X86ASM_STACK_H_
> +#ifndef _ASMX86_STACK_H_
> +#define _ASMX86_STACK_H_
>
> #ifndef _STACK_H_
> #error Do not directly include <asm/stack.h>. Just use <stack.h>.
> diff --git a/lib/x86/atomic.h b/lib/x86/atomic.h
> index c9ce489d3904..13e734bb464d 100644
> --- a/lib/x86/atomic.h
> +++ b/lib/x86/atomic.h
> @@ -1,5 +1,5 @@
> -#ifndef __ATOMIC_H
> -#define __ATOMIC_H
> +#ifndef _X86_ATOMIC_H_
> +#define _X86_ATOMIC_H_
>
> #include "asm-generic/atomic.h"
>
> diff --git a/lib/x86/delay.h b/lib/x86/delay.h
> index a51eb34485d0..26270edb2156 100644
> --- a/lib/x86/delay.h
> +++ b/lib/x86/delay.h
> @@ -1,5 +1,5 @@
> -#ifndef __X86_DELAY__
> -#define __X86_DELAY__
> +#ifndef _X86_DELAY_H_
> +#define _X86_DELAY_H_
>
> #include "libcflat.h"
>
> diff --git a/lib/x86/desc.h b/lib/x86/desc.h
> index 77b2c59d5551..a6ffb38c79a1 100644
> --- a/lib/x86/desc.h
> +++ b/lib/x86/desc.h
> @@ -1,5 +1,5 @@
> -#ifndef __IDT_TEST__
> -#define __IDT_TEST__
> +#ifndef _X86_DESC_H_
> +#define _X86_DESC_H_
>
> #include <setjmp.h>
>
> diff --git a/lib/x86/fault_test.h b/lib/x86/fault_test.h
> index dfa715ba6720..07566365d57c 100644
> --- a/lib/x86/fault_test.h
> +++ b/lib/x86/fault_test.h
> @@ -1,5 +1,5 @@
> -#ifndef __FAULT_TEST__
> -#define __FAULT_TEST__
> +#ifndef _X86_FAULT_TEST_H_
> +#define _X86_FAULT_TEST_H_
>
> #include "x86/msr.h"
> #include "x86/processor.h"
> diff --git a/lib/x86/fwcfg.h b/lib/x86/fwcfg.h
> index ac4257e5d78e..2434cf62222a 100644
> --- a/lib/x86/fwcfg.h
> +++ b/lib/x86/fwcfg.h
> @@ -1,5 +1,5 @@
> -#ifndef FWCFG_H
> -#define FWCFG_H
> +#ifndef _X86_FWCFG_H_
> +#define _X86_FWCFG_H_
>
> #include <stdint.h>
> #include <stdbool.h>
> diff --git a/lib/x86/intel-iommu.h b/lib/x86/intel-iommu.h
> index 05b9744b916b..e14f825e796d 100644
> --- a/lib/x86/intel-iommu.h
> +++ b/lib/x86/intel-iommu.h
> @@ -12,8 +12,8 @@
> * (From include/linux/intel-iommu.h)
> */
>
> -#ifndef __INTEL_IOMMU_H__
> -#define __INTEL_IOMMU_H__
> +#ifndef _X86_INTEL_IOMMU_H_
> +#define _X86_INTEL_IOMMU_H_
>
> #include "libcflat.h"
> #include "isr.h"
> diff --git a/lib/x86/isr.h b/lib/x86/isr.h
> index a50929190b64..746ac7af4a90 100644
> --- a/lib/x86/isr.h
> +++ b/lib/x86/isr.h
> @@ -1,5 +1,5 @@
> -#ifndef __ISR_TEST__
> -#define __ISR_TEST__
> +#ifndef _X86_ISR_H_
> +#define _X86_ISR_H_
>
> typedef struct {
> ulong regs[sizeof(ulong)*2];
> diff --git a/lib/x86/msr.h b/lib/x86/msr.h
> index 5213bcd55836..5001b169cc48 100644
> --- a/lib/x86/msr.h
> +++ b/lib/x86/msr.h
> @@ -1,5 +1,5 @@
> -#ifndef _ASM_X86_MSR_INDEX_H
> -#define _ASM_X86_MSR_INDEX_H
> +#ifndef _X86_MSR_H_
> +#define _X86_MSR_H_
>
> /* CPU model specific register (MSR) numbers */
>
> @@ -435,4 +435,4 @@
> #define MSR_VM_IGNNE 0xc0010115
> #define MSR_VM_HSAVE_PA 0xc0010117
>
> -#endif /* _ASM_X86_MSR_INDEX_H */
> +#endif /* _X86_MSR_H_ */
> diff --git a/lib/x86/processor.h b/lib/x86/processor.h
> index abc04b08afb0..b6068f52d850 100644
> --- a/lib/x86/processor.h
> +++ b/lib/x86/processor.h
> @@ -1,5 +1,5 @@
> -#ifndef LIBCFLAT_PROCESSOR_H
> -#define LIBCFLAT_PROCESSOR_H
> +#ifndef _X86_PROCESSOR_H_
> +#define _X86_PROCESSOR_H_
>
> #include "libcflat.h"
> #include "desc.h"
> diff --git a/lib/x86/smp.h b/lib/x86/smp.h
> index 09dfa86f123b..f74845e6903c 100644
> --- a/lib/x86/smp.h
> +++ b/lib/x86/smp.h
> @@ -1,5 +1,5 @@
> -#ifndef __SMP_H
> -#define __SMP_H
> +#ifndef _X86_SMP_H_
> +#define _X86_SMP_H_
> #include <asm/spinlock.h>
>
> void smp_init(void);
> diff --git a/lib/x86/usermode.h b/lib/x86/usermode.h
> index 4e005e65f917..04e358e2a3a3 100644
> --- a/lib/x86/usermode.h
> +++ b/lib/x86/usermode.h
> @@ -1,5 +1,5 @@
> -#ifndef _USERMODE_H_
> -#define _USERMODE_H_
> +#ifndef _X86_USERMODE_H_
> +#define _X86_USERMODE_H_
>
> #include "x86/msr.h"
> #include "x86/processor.h"
> diff --git a/lib/x86/vm.h b/lib/x86/vm.h
> index 3a1432f39d2a..d9753c3d4606 100644
> --- a/lib/x86/vm.h
> +++ b/lib/x86/vm.h
> @@ -1,5 +1,5 @@
> -#ifndef VM_H
> -#define VM_H
> +#ifndef _X86_VM_H_
> +#define _X86_VM_H_
>
> #include "processor.h"
> #include "asm/page.h"
> diff --git a/x86/hyperv.h b/x86/hyperv.h
> index e135221fa28a..e3803e02f4dc 100644
> --- a/x86/hyperv.h
> +++ b/x86/hyperv.h
> @@ -1,5 +1,5 @@
> -#ifndef __HYPERV_H
> -#define __HYPERV_H
> +#ifndef X86_HYPERV_H
> +#define X86_HYPERV_H
>
> #include "libcflat.h"
> #include "processor.h"
> diff --git a/x86/ioram.h b/x86/ioram.h
> index 2938142b36d3..9c816a83eae5 100644
> --- a/x86/ioram.h
> +++ b/x86/ioram.h
> @@ -1,5 +1,5 @@
> -#ifndef __IO_RAM_H
> -#define __IO_RAM_H
> +#ifndef X86_IORAM_H
> +#define X86_IORAM_H
>
> #define IORAM_BASE_PHYS 0xff000000UL
> #define IORAM_LEN 0x10000UL
> diff --git a/x86/kvmclock.h b/x86/kvmclock.h
> index f823c6dbb65d..1a40a7c0f6bc 100644
> --- a/x86/kvmclock.h
> +++ b/x86/kvmclock.h
> @@ -1,5 +1,5 @@
> -#ifndef KVMCLOCK_H
> -#define KVMCLOCK_H
> +#ifndef X86_KVMCLOCK_H
> +#define X86_KVMCLOCK_H
>
> #define MSR_KVM_WALL_CLOCK_NEW 0x4b564d00
> #define MSR_KVM_SYSTEM_TIME_NEW 0x4b564d01
> diff --git a/x86/svm.h b/x86/svm.h
> index 593e3b0f64b1..995b0f8ccbfe 100644
> --- a/x86/svm.h
> +++ b/x86/svm.h
> @@ -1,5 +1,5 @@
> -#ifndef __SVM_H
> -#define __SVM_H
> +#ifndef X86_SVM_H
> +#define X86_SVM_H
>
> #include "libcflat.h"
>
> diff --git a/x86/types.h b/x86/types.h
> index 047556e854d6..56ce5ececdec 100644
> --- a/x86/types.h
> +++ b/x86/types.h
> @@ -1,5 +1,5 @@
> -#ifndef __TYPES_H
> -#define __TYPES_H
> +#ifndef X86_TYPES_H
> +#define X86_TYPES_H
>
> #define DE_VECTOR 0
> #define DB_VECTOR 1
> diff --git a/x86/vmx.h b/x86/vmx.h
> index 7e39b843cafb..2c534ca4b801 100644
> --- a/x86/vmx.h
> +++ b/x86/vmx.h
> @@ -1,5 +1,5 @@
> -#ifndef __VMX_H
> -#define __VMX_H
> +#ifndef X86_VMX_H
> +#define X86_VMX_H
>
> #include "libcflat.h"
> #include "processor.h"
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2021-06-09 14:49 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 14:37 [kvm-unit-tests PATCH v2 0/7] unify header guards Cornelia Huck
2021-06-09 14:37 ` [kvm-unit-tests PATCH v2 1/7] README.md: add guideline for header guards format Cornelia Huck
2021-06-09 14:45 ` David Hildenbrand
2021-06-09 15:19 ` Cornelia Huck
2021-06-09 15:00 ` Laurent Vivier
2021-06-14 9:01 ` Andrew Jones
2021-06-09 14:37 ` [kvm-unit-tests PATCH v2 2/7] lib: unify header guards Cornelia Huck
2021-06-09 14:45 ` David Hildenbrand
2021-06-09 15:13 ` Laurent Vivier
2021-06-09 15:37 ` Cornelia Huck
2021-06-09 15:49 ` Laurent Vivier
2021-06-09 14:37 ` [kvm-unit-tests PATCH v2 3/7] asm-generic: " Cornelia Huck
2021-06-09 14:46 ` David Hildenbrand
2021-06-09 15:15 ` Laurent Vivier
2021-06-09 14:37 ` [kvm-unit-tests PATCH v2 4/7] arm: " Cornelia Huck
2021-06-09 14:46 ` David Hildenbrand
2021-06-09 15:24 ` Laurent Vivier
2021-06-09 15:47 ` Cornelia Huck
2021-06-09 15:51 ` Laurent Vivier
2021-06-09 14:37 ` [kvm-unit-tests PATCH v2 5/7] powerpc: " Cornelia Huck
2021-06-09 14:47 ` David Hildenbrand
2021-06-09 14:59 ` Laurent Vivier
2021-06-09 14:37 ` [kvm-unit-tests PATCH v2 6/7] s390x: " Cornelia Huck
2021-06-09 14:48 ` David Hildenbrand
2021-06-09 14:37 ` [kvm-unit-tests PATCH v2 7/7] x86: " Cornelia Huck
2021-06-09 14:49 ` David Hildenbrand [this message]
2021-06-10 12:17 ` [kvm-unit-tests PATCH v2 0/7] " Paolo Bonzini
2021-06-10 13:04 ` Cornelia Huck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=661ee535-bdac-aa1d-7b29-a271f698e778@redhat.com \
--to=david@redhat.com \
--cc=cohuck@redhat.com \
--cc=drjones@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-s390@vger.kernel.org \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).