| Message ID | 1467312465-3229-1-git-send-email-czuzu@bitdefender.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/30/16 21:47, Corneliu ZUZU wrote: > Move xen/paging.h #include from hvm/monitor.h to hvm/monitor.c (include strictly > where needed) and also change to asm/paging.h (include strictly what's needed). > > Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com> > --- > xen/arch/x86/hvm/monitor.c | 1 + > xen/include/asm-x86/hvm/monitor.h | 1 - > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c > index 472926c..d81b11b 100644 > --- a/xen/arch/x86/hvm/monitor.c > +++ b/xen/arch/x86/hvm/monitor.c > @@ -26,6 +26,7 @@ > #include <asm/hvm/monitor.h> > #include <asm/monitor.h> > #include <asm/vm_event.h> > +#include <asm/paging.h> > #include <public/vm_event.h> If this #include is not required to be exactly where it is, I believe alphabetical order is preferred (so #include <asm/paging.h> would be above #include <asm/vm_event.h>). Thanks, Razvan
On 7/1/2016 9:56 AM, Razvan Cojocaru wrote: > On 06/30/16 21:47, Corneliu ZUZU wrote: >> Move xen/paging.h #include from hvm/monitor.h to hvm/monitor.c (include strictly >> where needed) and also change to asm/paging.h (include strictly what's needed). >> >> Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com> >> --- >> xen/arch/x86/hvm/monitor.c | 1 + >> xen/include/asm-x86/hvm/monitor.h | 1 - >> 2 files changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c >> index 472926c..d81b11b 100644 >> --- a/xen/arch/x86/hvm/monitor.c >> +++ b/xen/arch/x86/hvm/monitor.c >> @@ -26,6 +26,7 @@ >> #include <asm/hvm/monitor.h> >> #include <asm/monitor.h> >> #include <asm/vm_event.h> >> +#include <asm/paging.h> >> #include <public/vm_event.h> > If this #include is not required to be exactly where it is, I believe > alphabetical order is preferred (so #include <asm/paging.h> would be > above #include <asm/vm_event.h>). > > > Thanks, > Razvan > Didn't know that was the rule, ack. Thanks, Corneliu.
>>> On 01.07.16 at 09:02, <czuzu@bitdefender.com> wrote: > On 7/1/2016 9:56 AM, Razvan Cojocaru wrote: >> On 06/30/16 21:47, Corneliu ZUZU wrote: >>> --- a/xen/arch/x86/hvm/monitor.c >>> +++ b/xen/arch/x86/hvm/monitor.c >>> @@ -26,6 +26,7 @@ >>> #include <asm/hvm/monitor.h> >>> #include <asm/monitor.h> >>> #include <asm/vm_event.h> >>> +#include <asm/paging.h> >>> #include <public/vm_event.h> >> If this #include is not required to be exactly where it is, I believe >> alphabetical order is preferred (so #include <asm/paging.h> would be >> above #include <asm/vm_event.h>). > > Didn't know that was the rule, ack. The fundamental idea being that conflicts between patches are more likely when everyone just adds to the end of a group. Jan
On 7/1/2016 10:31 AM, Jan Beulich wrote: >>>> On 01.07.16 at 09:02, <czuzu@bitdefender.com> wrote: >> On 7/1/2016 9:56 AM, Razvan Cojocaru wrote: >>> On 06/30/16 21:47, Corneliu ZUZU wrote: >>>> --- a/xen/arch/x86/hvm/monitor.c >>>> +++ b/xen/arch/x86/hvm/monitor.c >>>> @@ -26,6 +26,7 @@ >>>> #include <asm/hvm/monitor.h> >>>> #include <asm/monitor.h> >>>> #include <asm/vm_event.h> >>>> +#include <asm/paging.h> >>>> #include <public/vm_event.h> >>> If this #include is not required to be exactly where it is, I believe >>> alphabetical order is preferred (so #include <asm/paging.h> would be >>> above #include <asm/vm_event.h>). >> Didn't know that was the rule, ack. > The fundamental idea being that conflicts between patches are more > likely when everyone just adds to the end of a group. > > Jan Makes sense, thanks. Corneliu.
diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c index 472926c..d81b11b 100644 --- a/xen/arch/x86/hvm/monitor.c +++ b/xen/arch/x86/hvm/monitor.c @@ -26,6 +26,7 @@ #include <asm/hvm/monitor.h> #include <asm/monitor.h> #include <asm/vm_event.h> +#include <asm/paging.h> #include <public/vm_event.h> bool_t hvm_monitor_cr(unsigned int index, unsigned long value, unsigned long old) diff --git a/xen/include/asm-x86/hvm/monitor.h b/xen/include/asm-x86/hvm/monitor.h index ab433ed..6c6ea5c 100644 --- a/xen/include/asm-x86/hvm/monitor.h +++ b/xen/include/asm-x86/hvm/monitor.h @@ -19,7 +19,6 @@ #ifndef __ASM_X86_HVM_MONITOR_H__ #define __ASM_X86_HVM_MONITOR_H__ -#include <xen/paging.h> #include <public/vm_event.h> enum hvm_monitor_breakpoint_type
Move xen/paging.h #include from hvm/monitor.h to hvm/monitor.c (include strictly where needed) and also change to asm/paging.h (include strictly what's needed). Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com> --- xen/arch/x86/hvm/monitor.c | 1 + xen/include/asm-x86/hvm/monitor.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)