From patchwork Mon Feb 6 12:42:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xenia Ragiadakou X-Patchwork-Id: 13129817 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E9ADEC05027 for ; Mon, 6 Feb 2023 12:43:15 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.490354.759008 (Exim 4.92) (envelope-from ) id 1pP0pv-0005H2-0X; Mon, 06 Feb 2023 12:43:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 490354.759008; Mon, 06 Feb 2023 12:43:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pP0pu-0005Gu-TS; Mon, 06 Feb 2023 12:43:06 +0000 Received: by outflank-mailman (input) for mailman id 490354; Mon, 06 Feb 2023 12:43:06 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pP0pt-0005GF-Vi for xen-devel@lists.xenproject.org; Mon, 06 Feb 2023 12:43:06 +0000 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [2a00:1450:4864:20::42e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id cbcc1dab-a61b-11ed-93b5-47a8fe42b414; Mon, 06 Feb 2023 13:43:03 +0100 (CET) Received: by mail-wr1-x42e.google.com with SMTP id g6so2251659wrv.1 for ; Mon, 06 Feb 2023 04:43:03 -0800 (PST) Received: from uni.router.wind (adsl-89.109.242.139.tellas.gr. [109.242.139.89]) by smtp.googlemail.com with ESMTPSA id o15-20020adfa10f000000b002bddaea7a0bsm8881450wro.57.2023.02.06.04.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 04:43:02 -0800 (PST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cbcc1dab-a61b-11ed-93b5-47a8fe42b414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MNDsqUhVp4CrpdRW5c2DDqCamntpV86ahP5h/2pH/yM=; b=mWamJfY77NtlQrOeItwBjf30DLN/kcIGuFvTr3GQF13Fway6y1IxFTPwI0KYkVJvzh /0v/ACirRrkby+/TzP6Fzmu+bPggVRQlQ5xUOIA6iwNzgv56+43usbqyb9U7y5oI32mz GTTIvaCFGO+69SfqwsQwy75c2Kef/LSCBycRoykolTjbFFVfHAcdQz9LepSXQiAABu7b d86uFfVl/mpGigMfRU47wf/6FDkkyc2pCDPUifeWdcEGaLadRyo5fYvVY5KX8h8aomvH 7jUP3z6lkrdMlXiLUpSatgO5P+mtE84BWqvjM2TJAcHIyg9TseE7TzWjolnf/nti9f/V fi4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MNDsqUhVp4CrpdRW5c2DDqCamntpV86ahP5h/2pH/yM=; b=CFZC2674nOKnUX9h1AHS8RAHCXANp0aJ9rRWbR8gC0K+d76hN4e8XICL/25uYBsuk8 D6KO1WUjay6BJwkfYBYshqIMMMAPuYuX/EYWwzXx5bjNfICvrFGeEuiZm/DxywMitwAA CRnzzuB+TdjmXuo0vPqPHtXYtZAG80XaGJpxDnuJwgCRvo6VJgjcRA4JcrUxhhVWU59D b/Pt9wIQ38BQyLvZnofXssbgGQo2tu7ZzcpmiRamFQFsWABl2PnJJmudD4EO8MmrFX9E tCgBl7FOdoDmBkftnf5gB7XHm5PbnMiPgPn/4LOE9XhBr3tvFbftZdWUEM0m2kB683U7 H9dg== X-Gm-Message-State: AO0yUKWI7E4Tlex5HSSt0u38LR+x/W0JCQdC4bz45zTfb9rUUKgUn8G/ tYf0791RIT4kD7GT6Ls3UEoLIs33kPo= X-Google-Smtp-Source: AK7set+pn2ZACVv7Cs0+tdmWIDEb8U7yE5/zmsQ8ZHjja9zaPLHSq206t6JgGqT7vLZFrTtRYQwvzw== X-Received: by 2002:a5d:5284:0:b0:2c3:d296:7a84 with SMTP id c4-20020a5d5284000000b002c3d2967a84mr9232097wrv.17.1675687382566; Mon, 06 Feb 2023 04:43:02 -0800 (PST) From: Xenia Ragiadakou To: xen-devel@lists.xenproject.org Cc: Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu , Jun Nakajima , Kevin Tian , Paul Durrant , George Dunlap Subject: [PATCH 1/2] x86: do not include asm/hvm/support.h when not used Date: Mon, 6 Feb 2023 14:42:50 +0200 Message-Id: <20230206124251.911744-2-burzalodowa@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230206124251.911744-1-burzalodowa@gmail.com> References: <20230206124251.911744-1-burzalodowa@gmail.com> MIME-Version: 1.0 When none of the declarations and macro definitions in asm/hvm/support.h is referred in the file, do not include the header. To fix subsequent build errors, which were not triggered before due to the indirect inclusion of the missing headers by asm/hvm/support.h, include any missing headers. No functional change intended. Signed-off-by: Xenia Ragiadakou Acked-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/intel.c | 2 +- xen/arch/x86/cpu/vpmu.c | 1 - xen/arch/x86/cpu/vpmu_intel.c | 1 - xen/arch/x86/crash.c | 1 - xen/arch/x86/domain.c | 1 - xen/arch/x86/domctl.c | 1 - xen/arch/x86/emul-i8254.c | 2 +- xen/arch/x86/hvm/hpet.c | 2 +- xen/arch/x86/hvm/io.c | 1 - xen/arch/x86/hvm/irq.c | 2 +- xen/arch/x86/hvm/pmtimer.c | 3 ++- xen/arch/x86/hvm/rtc.c | 3 ++- xen/arch/x86/hvm/save.c | 2 -- xen/arch/x86/hvm/stdvga.c | 1 - xen/arch/x86/hvm/svm/emulate.c | 1 - xen/arch/x86/hvm/svm/intr.c | 1 - xen/arch/x86/hvm/svm/vmcb.c | 1 - xen/arch/x86/hvm/viridian/synic.c | 1 - xen/arch/x86/hvm/viridian/time.c | 1 - xen/arch/x86/hvm/viridian/viridian.c | 1 - xen/arch/x86/hvm/vmx/intr.c | 1 - xen/arch/x86/hvm/vmx/vmcs.c | 1 - xen/arch/x86/hvm/vmx/vvmx.c | 1 + xen/arch/x86/hvm/vpic.c | 2 +- xen/arch/x86/hvm/vpt.c | 2 +- xen/arch/x86/i387.c | 1 - xen/arch/x86/include/asm/hvm/vmx/vmx.h | 2 +- xen/arch/x86/mm/altp2m.c | 1 - xen/arch/x86/mm/hap/nested_ept.c | 1 - xen/arch/x86/mm/hap/nested_hap.c | 1 - xen/arch/x86/oprofile/op_model_athlon.c | 2 +- xen/arch/x86/oprofile/xenoprof.c | 1 - xen/arch/x86/smp.c | 1 - xen/arch/x86/sysctl.c | 1 - xen/arch/x86/x86_64/traps.c | 1 - xen/arch/x86/xstate.c | 1 - xen/drivers/passthrough/x86/hvm.c | 1 - 38 files changed, 14 insertions(+), 38 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 1ddb55cbe5..caafe44740 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -4,12 +4,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index dc6a0c7807..71fc1a1e18 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -10,7 +11,6 @@ #include #include #include -#include #include "cpu.h" diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index 33e2fca8cd..b6b7342fb4 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index b91d818be0..a8df52579d 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 99089f77a7..7850f0af24 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index d7a8237f01..abd2b4ad68 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index e9bfbc57a7..2118fcad5d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include /* for hvm_acpi_power_button */ #include /* for arch_do_domctl */ diff --git a/xen/arch/x86/emul-i8254.c b/xen/arch/x86/emul-i8254.c index 18894b6348..1688b7e458 100644 --- a/xen/arch/x86/emul-i8254.c +++ b/xen/arch/x86/emul-i8254.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index 45c7b9b406..c65e1b27d0 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index 0309d05cfd..5ae209d3b6 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index d93ffe4546..4fe87a71c1 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 2a89bbdfa5..b89d0fd53b 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -17,9 +17,10 @@ * this program; If not, see . */ +#include #include #include -#include +#include #include /* for hvm_acpi_power_button prototype */ #include diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c index d21925db08..44f2fb668d 100644 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -22,10 +22,11 @@ * IN THE SOFTWARE. */ +#include #include #include #include -#include +#include #include #include #include diff --git a/xen/arch/x86/hvm/save.c b/xen/arch/x86/hvm/save.c index 86c82cbd74..c1675e3d9f 100644 --- a/xen/arch/x86/hvm/save.c +++ b/xen/arch/x86/hvm/save.c @@ -24,8 +24,6 @@ #include #include -#include - #include void arch_hvm_save(struct domain *d, struct hvm_save_header *hdr) diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c index be8200c8d0..798a9a0549 100644 --- a/xen/arch/x86/hvm/stdvga.c +++ b/xen/arch/x86/hvm/stdvga.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include diff --git a/xen/arch/x86/hvm/svm/emulate.c b/xen/arch/x86/hvm/svm/emulate.c index 635b3705f7..16fc134883 100644 --- a/xen/arch/x86/hvm/svm/emulate.c +++ b/xen/arch/x86/hvm/svm/emulate.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c index 7f815d2307..9525f35593 100644 --- a/xen/arch/x86/hvm/svm/intr.c +++ b/xen/arch/x86/hvm/svm/intr.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 0fc57dfd71..305d4767e3 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/viridian/synic.c b/xen/arch/x86/hvm/viridian/synic.c index 856bb898b8..83d7addfc3 100644 --- a/xen/arch/x86/hvm/viridian/synic.c +++ b/xen/arch/x86/hvm/viridian/synic.c @@ -13,7 +13,6 @@ #include #include -#include #include #include "private.h" diff --git a/xen/arch/x86/hvm/viridian/time.c b/xen/arch/x86/hvm/viridian/time.c index b56fd67662..a3ea3fa067 100644 --- a/xen/arch/x86/hvm/viridian/time.c +++ b/xen/arch/x86/hvm/viridian/time.c @@ -15,7 +15,6 @@ #include #include #include -#include #include "private.h" diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c index 2937ddd3a8..7405c117bc 100644 --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 13bbe8430d..6a8316de0e 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 7d8bfeb539..09edbd23b3 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index f8fe8d0c14..674cdabb07 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c index b3cafaab8f..17e15720f0 100644 --- a/xen/arch/x86/hvm/vpic.c +++ b/xen/arch/x86/hvm/vpic.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #define vpic_domain(v) (container_of((v), struct domain, \ arch.hvm.vpic[!vpic->is_master])) diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c index cb1d81bf9e..621f5bb88b 100644 --- a/xen/arch/x86/hvm/vpt.c +++ b/xen/arch/x86/hvm/vpt.c @@ -16,8 +16,8 @@ * this program; If not, see . */ +#include #include -#include #include #include #include diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index 677f571792..d824f2bb52 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h index 96a9f07ca5..234da4a7f4 100644 --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h @@ -23,8 +23,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/xen/arch/x86/mm/altp2m.c b/xen/arch/x86/mm/altp2m.c index 8be6eaf242..07393befee 100644 --- a/xen/arch/x86/mm/altp2m.c +++ b/xen/arch/x86/mm/altp2m.c @@ -15,7 +15,6 @@ * this program; If not, see . */ -#include #include #include #include diff --git a/xen/arch/x86/mm/hap/nested_ept.c b/xen/arch/x86/mm/hap/nested_ept.c index 23fb3889b7..605e47c16c 100644 --- a/xen/arch/x86/mm/hap/nested_ept.c +++ b/xen/arch/x86/mm/hap/nested_ept.c @@ -25,7 +25,6 @@ #include #include #include -#include #include diff --git a/xen/arch/x86/mm/hap/nested_hap.c b/xen/arch/x86/mm/hap/nested_hap.c index b19f657c27..098e8e5d4c 100644 --- a/xen/arch/x86/mm/hap/nested_hap.c +++ b/xen/arch/x86/mm/hap/nested_hap.c @@ -27,7 +27,6 @@ #include #include #include -#include #include diff --git a/xen/arch/x86/oprofile/op_model_athlon.c b/xen/arch/x86/oprofile/op_model_athlon.c index 7bc5853a6c..69fd3fcc86 100644 --- a/xen/arch/x86/oprofile/op_model_athlon.c +++ b/xen/arch/x86/oprofile/op_model_athlon.c @@ -10,6 +10,7 @@ * @author Graydon Hoare */ +#include #include #include #include @@ -18,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/xen/arch/x86/oprofile/xenoprof.c b/xen/arch/x86/oprofile/xenoprof.c index b20f26bbe5..247a0deca8 100644 --- a/xen/arch/x86/oprofile/xenoprof.c +++ b/xen/arch/x86/oprofile/xenoprof.c @@ -12,7 +12,6 @@ #include #include #include -#include #include "op_counter.h" diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index b42603c351..3a331cbdbc 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index f82abc2488..f42a3b843b 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index f8cb8d9a94..f4d17b4830 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -23,7 +23,6 @@ #include #include #include -#include static void print_xen_info(void) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 3b32bdc51c..d481e1db3e 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/xen/drivers/passthrough/x86/hvm.c b/xen/drivers/passthrough/x86/hvm.c index 6bbd04bf3d..8175ba629a 100644 --- a/xen/drivers/passthrough/x86/hvm.c +++ b/xen/drivers/passthrough/x86/hvm.c @@ -23,7 +23,6 @@ #include #include #include -#include #include /*