Re: [Xen-devel] [PATCH v3 1/9] x86/HVM: reduce domain.h include dependencies

[Jan Beulich <jbeulich@xxxxxxxx>]

On 13.03.2020 12:14, Jan Beulich wrote:
> Drop #include-s not needed by the header itself. Put the ones needed
> into whichever other files actually need them.
> 
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
> Reviewed-by: Paul Durrant <paul@xxxxxxx>
> ---
> v3: Also make things build with all{yes,no}config.
> v2: Also make things build with XSM=y.

Just FYI: Because of the fair risk of this patch (or later ones in
the series) going stale in perhaps subtle ways I'm intending to
time out waiting for further acks tomorrow. The changes made, after
all, are largely mechanical.

Jan

> --- a/xen/arch/x86/cpu/mcheck/vmce.c
> +++ b/xen/arch/x86/cpu/mcheck/vmce.c
> @@ -28,6 +28,7 @@
>  #include <xen/mm.h>
>  #include <asm/hvm/save.h>
>  #include <asm/processor.h>
> +#include <public/hvm/params.h>
>  #include <public/sysctl.h>
>  #include <asm/system.h>
>  #include <asm/msr.h>
> --- a/xen/arch/x86/hvm/dm.c
> +++ b/xen/arch/x86/hvm/dm.c
> @@ -27,6 +27,8 @@
>  
>  #include <xsm/xsm.h>
>  
> +#include <public/hvm/hvm_op.h>
> +
>  struct dmop_args {
>      domid_t domid;
>      unsigned int nr_bufs;
> --- a/xen/arch/x86/hvm/dom0_build.c
> +++ b/xen/arch/x86/hvm/dom0_build.c
> @@ -38,6 +38,7 @@
>  #include <public/arch-x86/hvm/start_info.h>
>  #include <public/hvm/hvm_info_table.h>
>  #include <public/hvm/hvm_vcpu.h>
> +#include <public/hvm/params.h>
>  
>  /*
>   * Have the TSS cover the ISA port range, which makes it
> --- a/xen/arch/x86/hvm/hpet.c
> +++ b/xen/arch/x86/hvm/hpet.c
> @@ -26,6 +26,7 @@
>  #include <xen/event.h>
>  #include <xen/trace.h>
>  #include <xen/nospec.h>
> +#include <public/hvm/params.h>
>  
>  #define domain_vhpet(x) (&(x)->arch.hvm.pl_time->vhpet)
>  #define vcpu_vhpet(x)   (domain_vhpet((x)->domain))
> --- a/xen/arch/x86/hvm/hypercall.c
> +++ b/xen/arch/x86/hvm/hypercall.c
> @@ -24,6 +24,9 @@
>  
>  #include <asm/hvm/support.h>
>  
> +#include <public/hvm/hvm_op.h>
> +#include <public/hvm/params.h>
> +
>  static long hvm_memory_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
>  {
>      const struct vcpu *curr = current;
> --- a/xen/arch/x86/hvm/ioreq.c
> +++ b/xen/arch/x86/hvm/ioreq.c
> @@ -34,6 +34,7 @@
>  #include <asm/hvm/vmx/vmx.h>
>  
>  #include <public/hvm/ioreq.h>
> +#include <public/hvm/params.h>
>  
>  static void set_ioreq_server(struct domain *d, unsigned int id,
>                               struct hvm_ioreq_server *s)
> --- a/xen/arch/x86/hvm/irq.c
> +++ b/xen/arch/x86/hvm/irq.c
> @@ -26,6 +26,7 @@
>  #include <asm/hvm/domain.h>
>  #include <asm/hvm/support.h>
>  #include <asm/msi.h>
> +#include <public/hvm/params.h>
>  
>  bool hvm_domain_use_pirq(const struct domain *d, const struct pirq *pirq)
>  {
> --- a/xen/arch/x86/hvm/rtc.c
> +++ b/xen/arch/x86/hvm/rtc.c
> @@ -28,6 +28,7 @@
>  #include <asm/hvm/support.h>
>  #include <asm/current.h>
>  #include <xen/trace.h>
> +#include <public/hvm/params.h>
>  
>  #define USEC_PER_SEC    1000000UL
>  #define NS_PER_USEC     1000UL
> --- a/xen/arch/x86/hvm/viridian/private.h
> +++ b/xen/arch/x86/hvm/viridian/private.h
> @@ -4,6 +4,7 @@
>  #define X86_HVM_VIRIDIAN_PRIVATE_H
>  
>  #include <asm/hvm/save.h>
> +#include <public/hvm/params.h>
>  
>  int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val);
>  int viridian_synic_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val);
> --- a/xen/arch/x86/hvm/vpt.c
> +++ b/xen/arch/x86/hvm/vpt.c
> @@ -22,6 +22,7 @@
>  #include <asm/event.h>
>  #include <asm/apic.h>
>  #include <asm/mc146818rtc.h>
> +#include <public/hvm/params.h>
>  
>  #define mode_is(d, name) \
>      ((d)->arch.hvm.params[HVM_PARAM_TIMER_MODE] == HVMPTM_##name)
> --- a/xen/arch/x86/msr.c
> +++ b/xen/arch/x86/msr.c
> @@ -28,6 +28,8 @@
>  #include <asm/msr.h>
>  #include <asm/setup.h>
>  
> +#include <public/hvm/params.h>
> +
>  DEFINE_PER_CPU(uint32_t, tsc_aux);
>  
>  struct msr_policy __read_mostly     raw_msr_policy,
> --- a/xen/arch/x86/pv/shim.c
> +++ b/xen/arch/x86/pv/shim.c
> @@ -35,6 +35,7 @@
>  #include <asm/pv/mm.h>
>  
>  #include <public/arch-x86/cpuid.h>
> +#include <public/hvm/params.h>
>  
>  #include <compat/grant_table.h>
>  
> --- a/xen/arch/x86/traps.c
> +++ b/xen/arch/x86/traps.c
> @@ -76,6 +76,7 @@
>  #include <asm/hpet.h>
>  #include <asm/vpmu.h>
>  #include <public/arch-x86/cpuid.h>
> +#include <public/hvm/params.h>
>  #include <asm/cpuid.h>
>  #include <xsm/xsm.h>
>  #include <asm/pv/traps.h>
> --- a/xen/common/vm_event.c
> +++ b/xen/common/vm_event.c
> @@ -29,6 +29,7 @@
>  #include <asm/monitor.h>
>  #include <asm/vm_event.h>
>  #include <xsm/xsm.h>
> +#include <public/hvm/params.h>
>  
>  /* for public/io/ring.h macros */
>  #define xen_mb()   smp_mb()
> --- a/xen/drivers/char/xen_pv_console.c
> +++ b/xen/drivers/char/xen_pv_console.c
> @@ -28,6 +28,7 @@
>  #include <asm/fixmap.h>
>  #include <asm/guest.h>
>  
> +#include <public/hvm/params.h>
>  #include <public/io/console.h>
>  
>  static struct xencons_interface *cons_ring;
> --- a/xen/include/asm-x86/hvm/domain.h
> +++ b/xen/include/asm-x86/hvm/domain.h
> @@ -20,20 +20,14 @@
>  #ifndef __ASM_X86_HVM_DOMAIN_H__
>  #define __ASM_X86_HVM_DOMAIN_H__
>  
> -#include <xen/iommu.h>
> -#include <asm/hvm/irq.h>
> -#include <asm/hvm/vpt.h>
> -#include <asm/hvm/vlapic.h>
> -#include <asm/hvm/vioapic.h>
> +#include <xen/list.h>
> +#include <xen/mm.h>
> +#include <xen/radix-tree.h>
> +
>  #include <asm/hvm/io.h>
> -#include <asm/hvm/viridian.h>
>  #include <asm/hvm/vmx/vmcs.h>
>  #include <asm/hvm/svm/vmcb.h>
> -#include <asm/mem_sharing.h>
> -#include <public/grant_table.h>
> -#include <public/hvm/params.h>
> -#include <public/hvm/save.h>
> -#include <public/hvm/hvm_op.h>
> +
>  #include <public/hvm/dm_op.h>
>  
>  struct hvm_ioreq_page {
> --- a/xen/include/asm-x86/hvm/nestedhvm.h
> +++ b/xen/include/asm-x86/hvm/nestedhvm.h
> @@ -22,6 +22,7 @@
>  #include <xen/types.h>         /* for uintNN_t */
>  #include <xen/sched.h>         /* for struct vcpu, struct domain */
>  #include <asm/hvm/vcpu.h>      /* for vcpu_nestedhvm */
> +#include <public/hvm/params.h>
>  
>  enum nestedhvm_vmexits {
>      NESTEDHVM_VMEXIT_ERROR = 0, /* inject VMEXIT w/ invalid VMCB */
> --- a/xen/include/xsm/dummy.h
> +++ b/xen/include/xsm/dummy.h
> @@ -17,6 +17,7 @@
>  
>  #include <xen/sched.h>
>  #include <xsm/xsm.h>
> +#include <public/hvm/params.h>
>  
>  /* Cannot use BUILD_BUG_ON here because the expressions we check are not
>   * considered constant at compile time. Instead, rely on constant 
> propagation to
> --- a/xen/xsm/flask/hooks.c
> +++ b/xen/xsm/flask/hooks.c
> @@ -28,7 +28,7 @@
>  #include <public/physdev.h>
>  #include <public/platform.h>
>  #include <public/version.h>
> -
> +#include <public/hvm/params.h>
>  #include <public/xsm/flask_op.h>
>  
>  #include <avc.h>
> 


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel