conflict in public header for values definitions

conflict in public header for values definitions

[Igor Kozhukhov]

Hello All,

I'm working on port xen-4.2 to illumos based platform - DilOS - and have problems with conflicts for:

xen/include/public/trace.h :

struct t_buf {}
struct t_info {}

I have a questions - can we rename structures to:
struct t_buf_xen {}
struct t_info_xen {}

Will it be applicable for Xen sources ?
if yes - i can update Xen sources by new variables and provide changes to review.

it will help with next Xen ports without changes in public headers.

--
Best regards,
Igor Kozhukhov

Re: conflict in public header for values definitions

[Andrew Cooper]

On 03/01/14 18:38, Igor Kozhukhov wrote:
> Hello All,
>
> I'm working on port xen-4.2 to illumos based platform - DilOS - and have problems with conflicts for:
>
> xen/include/public/trace.h :
>
> struct t_buf {}
> struct t_info {}
>
> I have a questions - can we rename structures to:
> struct t_buf_xen {}
> struct t_info_xen {}
>
> Will it be applicable for Xen sources ?

You would break the compilation for every other user of trace.h, so no.

If it conflicts with something locally, you could do something like:
(completely untested)

#define t_buf t_buf_xen
#include <public/trace.h>
#undef t_buf

And use t_buf_xen in your own code.

~Andrew

Re: conflict in public header for values definitions

[Igor Kozhukhov]

Hi Andrew,

it is impossible to do outside public headers, because we have trace.h included to another public readers - for example: xen/public/hvm/hvm_op.h

will be better to have committed changes in public headers for next ports without additional changes in sources.

is it possible to add '#ifdef __sun' to public headers ?
I can try to do it and provide review ?
or i need update public headers in illumos tree every time ?

--
Best regards,
Igor Kozhukhov




On Jan 3, 2014, at 10:43 PM, Andrew Cooper wrote:

> On 03/01/14 18:38, Igor Kozhukhov wrote:
>> Hello All,
>> 
>> I'm working on port xen-4.2 to illumos based platform - DilOS - and have problems with conflicts for:
>> 
>> xen/include/public/trace.h :
>> 
>> struct t_buf {}
>> struct t_info {}
>> 
>> I have a questions - can we rename structures to:
>> struct t_buf_xen {}
>> struct t_info_xen {}
>> 
>> Will it be applicable for Xen sources ?
> 
> You would break the compilation for every other user of trace.h, so no.
> 
> If it conflicts with something locally, you could do something like:
> (completely untested)
> 
> #define t_buf t_buf_xen
> #include <public/trace.h>
> #undef t_buf
> 
> And use t_buf_xen in your own code.
> 
> ~Andrew
> 

Re: conflict in public header for values definitions

[Ian Campbell]

On Fri, 2014-01-03 at 22:38 +0400, Igor Kozhukhov wrote:
> Hello All,
> 
> I'm working on port xen-4.2 to illumos based platform - DilOS - and have problems with conflicts for:
> 
> xen/include/public/trace.h :
> 
> struct t_buf {}
> struct t_info {}

What do these conflict with? Is it user or kernel space? Please can you
provide the full build error for context.

Ian.

Re: conflict in public header for values definitions

[Jan Beulich]

>>> On 03.01.14 at 20:49, Igor Kozhukhov <ikozhukhov@gmail.com> wrote:
> it is impossible to do outside public headers, because we have trace.h 
> included to another public readers - for example: xen/public/hvm/hvm_op.h

Just create suitable wrapper headers for any such instance.

> will be better to have committed changes in public headers for next ports 
> without additional changes in sources.
> 
> is it possible to add '#ifdef __sun' to public headers ?

Not if there's a better way. Yes, I agree that the lack of xen_
prefixes in various places is unfortunate, but I don't see why
you shouldn't be able to cope if everyone else can.

Jan