Re: [Minios-devel] [PATCH] minios: fix build issue with xen_*mb defines

[Juergen Gross <jgross@suse.com>]

On 28/09/16 12:10, Wei Liu wrote:
> On Wed, Sep 28, 2016 at 12:06:02PM +0200, Juergen Gross wrote:
>> On 28/09/16 12:01, Wei Liu wrote:
>>> On Wed, Sep 28, 2016 at 11:50:04AM +0200, Juergen Gross wrote:
>>>> Commit e35295d724d64e6e025ec31c2e510e448b8641d1 ("mini-os: fix builds
>>>> with uncommon config settings") introduced a bug which will break
>>>> the build, as xc_minios.c will have defined those macros via
>>>> xc_private.h.
>>>>
>>>> Fix this by defining the macros only if compiling a minios source.
>>>>
>>>
>>> Reported-by: Wei Liu <wei.liu2@citrix.com>
>>>
>>>> Signed-off-by: Juergen Gross <jgross@suse.com>
>>>
>>> Reviewed-by: Wei Liu <wei.liu2@citrix.com>
>>>
>>>> ---
>>>>  include/x86/os.h | 4 ++--
>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/include/x86/os.h b/include/x86/os.h
>>>> index 0f5dd6c..fbc2eeb 100644
>>>> --- a/include/x86/os.h
>>>> +++ b/include/x86/os.h
>>>> @@ -511,14 +511,14 @@ static __inline__ unsigned long __ffs(unsigned long word)
>>>>  #error "Unsupported architecture"
>>>>  #endif
>>>>  
>>>> -#endif /* ifdef __INSIDE_MINIOS */
>>>> -
>>>>  /********************* common i386 and x86_64  ****************************/
>>>
>>> One nit, might want to retain the position of this comment.
>>
>> Didn't I?
>>
>> Or do you mean it should be outside the ifdef? So keeping the #endif
>> above and adding another #ifdef __INSIDE_MINIOS after the comment?
>>
> 
> What I meant is to have the comment before wrmsr as before. But I think
> it is also a valid comment in its position now. I don't want to bikeshed
> too much on this.

Well, the xen_*mb stuff _is_ common to i386 and x86_64. I placed those
defines at that position on purpose. Moving the comment after those
defines would position them in the x86-64 specific section when looking
at the comments.


Juergen

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