Re: [Xen-devel] [PATCH v3 7/8] minor fixes (formatting, comments, unused includes etc.)

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 06.07.16 at 17:55, <czuzu@xxxxxxxxxxxxxxx> wrote:
> --- a/xen/arch/x86/hvm/hvm.c
> +++ b/xen/arch/x86/hvm/hvm.c
> @@ -31,7 +31,6 @@
>  #include <xen/hypercall.h>
>  #include <xen/guest_access.h>
>  #include <xen/event.h>
> -#include <xen/paging.h>
>  #include <xen/cpu.h>
>  #include <xen/wait.h>
>  #include <xen/mem_access.h>
> @@ -63,11 +62,9 @@
>  #include <asm/hvm/nestedhvm.h>
>  #include <asm/hvm/monitor.h>
>  #include <asm/hvm/ioreq.h>
> -#include <asm/hvm/vmx/vmx.h>
>  #include <asm/altp2m.h>
>  #include <asm/mtrr.h>
>  #include <asm/apic.h>
> -#include <asm/vm_event.h>
>  #include <public/sched.h>
>  #include <public/hvm/ioreq.h>
>  #include <public/version.h>

The inclusion of asm/vm_event.h should really be removed in patch 2,
I had to drop it here, to get the patch to apply ahead of the earlier
ones in this series.

> --- a/xen/arch/x86/monitor.c
> +++ b/xen/arch/x86/monitor.c
> @@ -21,7 +21,6 @@
>  
>  #include <asm/hvm/vmx/vmx.h>
>  #include <asm/monitor.h>
> -#include <asm/vm_event.h>
>  #include <public/vm_event.h>
>  
>  static inline void write_ctrlreg_adjust_traps(struct domain *d, uint8_t 
> index)

Similarly I had to drop this hunk, which suggests that one of the
earlier patches needlessly adds that #include (or it gets validly
added and then a later patch makes it unnecessary again).

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel