From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29B27C48BE0 for ; Wed, 9 Jun 2021 14:37:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15E5D613BC for ; Wed, 9 Jun 2021 14:37:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238050AbhFIOjo (ORCPT ); Wed, 9 Jun 2021 10:39:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31333 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238029AbhFIOjm (ORCPT ); Wed, 9 Jun 2021 10:39:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623249467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ai3KE9i6b9ywqaLcDVZItt8K3xquUc+XYOJO2OUXN7Y=; b=JGxPorEc2kz2OMWru5TiF7rAjhOsoEKxHOnflxB+yi93wziZdUZ2VoUyp215SGofL30NlN Ue3Lk0cgeDO8hyAkYQoQ5cxNW55vPJGtQy4BuUcI7/YqKjx+tx9keCxeVIEqIeNLquAyD0 P9AKTFquA2JZUd0T3/4Gf1bWkqt+GJc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-q78o52dZM_2wdQYswQJNBg-1; Wed, 09 Jun 2021 10:37:46 -0400 X-MC-Unique: q78o52dZM_2wdQYswQJNBg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3FD96100944F; Wed, 9 Jun 2021 14:37:45 +0000 (UTC) Received: from gondolin.fritz.box (ovpn-113-134.ams2.redhat.com [10.36.113.134]) by smtp.corp.redhat.com (Postfix) with ESMTP id C48B819C46; Wed, 9 Jun 2021 14:37:40 +0000 (UTC) From: Cornelia Huck To: Paolo Bonzini , Thomas Huth , Andrew Jones Cc: kvm@vger.kernel.org, Laurent Vivier , David Hildenbrand , Janosch Frank , Claudio Imbrenda , kvmarm@lists.cs.columbia.edu, kvm-ppc@vger.kernel.org, linux-s390@vger.kernel.org, Cornelia Huck Subject: [kvm-unit-tests PATCH v2 7/7] x86: unify header guards Date: Wed, 9 Jun 2021 16:37:12 +0200 Message-Id: <20210609143712.60933-8-cohuck@redhat.com> In-Reply-To: <20210609143712.60933-1-cohuck@redhat.com> References: <20210609143712.60933-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Standardize header guards to _ASMX86_HEADER_H_, _X86_HEADER_H_, and X86_HEADER_H. Signed-off-by: Cornelia Huck --- 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 #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 * 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 * 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 * 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 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 . Just use . 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 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 #include 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 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" -- 2.31.1