[Qemu-devel] [PATCH] io: fix build on FreeBSD

[Qemu-devel] [PATCH] io: fix build on FreeBSD

[Ed Maste]

EAI_ADDRFAMILY is obsolete and FreeBSD/s netdb.h does not provide a
definition.

Signed-off-by: Ed Maste <emaste@freebsd.org>
---
 tests/test-io-channel-socket.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
index 0697363..f4dbd60 100644
--- a/tests/test-io-channel-socket.c
+++ b/tests/test-io-channel-socket.c
@@ -63,7 +63,10 @@ static int check_protocol_support(bool *has_ipv4, bool *has_ipv6)
 
     gaierr = getaddrinfo("::1", NULL, &hints, &ai);
     if (gaierr != 0) {
-        if (gaierr == EAI_ADDRFAMILY ||
+        if (
+#ifdef EAI_ADDRFAMILY
+            gaierr == EAI_ADDRFAMILY ||
+#endif
             gaierr == EAI_FAMILY ||
             gaierr == EAI_NONAME) {
             *has_ipv6 = false;
-- 
2.4.6

Re: [Qemu-devel] [PATCH] io: fix build on FreeBSD

[Daniel P. Berrange]

On Thu, Feb 25, 2016 at 10:31:32AM -0500, Ed Maste wrote:
> EAI_ADDRFAMILY is obsolete and FreeBSD/s netdb.h does not provide a
> definition.
> 
> Signed-off-by: Ed Maste <emaste@freebsd.org>
> ---
>  tests/test-io-channel-socket.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

Copying qemu-trivial to pick up the patch

> 
> diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
> index 0697363..f4dbd60 100644
> --- a/tests/test-io-channel-socket.c
> +++ b/tests/test-io-channel-socket.c
> @@ -63,7 +63,10 @@ static int check_protocol_support(bool *has_ipv4, bool *has_ipv6)
>  
>      gaierr = getaddrinfo("::1", NULL, &hints, &ai);
>      if (gaierr != 0) {
> -        if (gaierr == EAI_ADDRFAMILY ||
> +        if (
> +#ifdef EAI_ADDRFAMILY
> +            gaierr == EAI_ADDRFAMILY ||
> +#endif
>              gaierr == EAI_FAMILY ||
>              gaierr == EAI_NONAME) {
>              *has_ipv6 = false;
> -- 
> 2.4.6
> 

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

Re: [Qemu-devel] [PATCH] io: fix build on FreeBSD

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]

On 02/25/2016 08:31 AM, Ed Maste wrote:
> EAI_ADDRFAMILY is obsolete and FreeBSD/s netdb.h does not provide a
> definition.
> 
> Signed-off-by: Ed Maste <emaste@freebsd.org>
> ---
>  tests/test-io-channel-socket.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
> index 0697363..f4dbd60 100644
> --- a/tests/test-io-channel-socket.c
> +++ b/tests/test-io-channel-socket.c
> @@ -63,7 +63,10 @@ static int check_protocol_support(bool *has_ipv4, bool *has_ipv6)
>  
>      gaierr = getaddrinfo("::1", NULL, &hints, &ai);
>      if (gaierr != 0) {
> -        if (gaierr == EAI_ADDRFAMILY ||
> +        if (
> +#ifdef EAI_ADDRFAMILY
> +            gaierr == EAI_ADDRFAMILY ||
> +#endif
>              gaierr == EAI_FAMILY ||

I'm not the biggest-fan of mid-expression #ifdefs. Can we rewrite this
to look more like:

#ifndef EAI_ADDRFAMILY
#define EAI_ADDRFAMILY EAI_FAMILY
#endif

and leave the conditional expression unchanged?

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH] io: fix build on FreeBSD

[Daniel P. Berrange]

On Thu, Feb 25, 2016 at 09:29:02AM -0700, Eric Blake wrote:
> On 02/25/2016 08:31 AM, Ed Maste wrote:
> > EAI_ADDRFAMILY is obsolete and FreeBSD/s netdb.h does not provide a
> > definition.
> > 
> > Signed-off-by: Ed Maste <emaste@freebsd.org>
> > ---
> >  tests/test-io-channel-socket.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
> > index 0697363..f4dbd60 100644
> > --- a/tests/test-io-channel-socket.c
> > +++ b/tests/test-io-channel-socket.c
> > @@ -63,7 +63,10 @@ static int check_protocol_support(bool *has_ipv4, bool *has_ipv6)
> >  
> >      gaierr = getaddrinfo("::1", NULL, &hints, &ai);
> >      if (gaierr != 0) {
> > -        if (gaierr == EAI_ADDRFAMILY ||
> > +        if (
> > +#ifdef EAI_ADDRFAMILY
> > +            gaierr == EAI_ADDRFAMILY ||
> > +#endif
> >              gaierr == EAI_FAMILY ||
> 
> I'm not the biggest-fan of mid-expression #ifdefs. Can we rewrite this
> to look more like:
> 
> #ifndef EAI_ADDRFAMILY
> #define EAI_ADDRFAMILY EAI_FAMILY
> #endif
> 
> and leave the conditional expression unchanged?

I think that'll cause gcc  6 to whine about you checking the same
value twice in the conditional, like how it complains that EWOULDBLOCK
and EAGAIN are the same.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

Re: [Qemu-devel] [PATCH] io: fix build on FreeBSD

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]

On 02/25/2016 09:32 AM, Daniel P. Berrange wrote:

>>> +        if (
>>> +#ifdef EAI_ADDRFAMILY
>>> +            gaierr == EAI_ADDRFAMILY ||
>>> +#endif
>>>              gaierr == EAI_FAMILY ||
>>
>> I'm not the biggest-fan of mid-expression #ifdefs. Can we rewrite this
>> to look more like:
>>
>> #ifndef EAI_ADDRFAMILY
>> #define EAI_ADDRFAMILY EAI_FAMILY
>> #endif
>>
>> and leave the conditional expression unchanged?
> 
> I think that'll cause gcc  6 to whine about you checking the same
> value twice in the conditional, like how it complains that EWOULDBLOCK
> and EAGAIN are the same.

Oh, right. That's annoying.  What about:

#ifndef EAI_ADDRFAMILY
#define EAI_ADDRFAMILY 0
#endif

if ((EAI_ADDRFAMILY && gaierr == EAIADDRFAMILY) ||
    gaierr == EAI_FAMILY...

to shut up gcc 6, while still hoisting the preprocessor logic outside of
the expression?

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH] io: fix build on FreeBSD

[Daniel P. Berrange]

On Thu, Feb 25, 2016 at 09:37:18AM -0700, Eric Blake wrote:
> On 02/25/2016 09:32 AM, Daniel P. Berrange wrote:
> 
> >>> +        if (
> >>> +#ifdef EAI_ADDRFAMILY
> >>> +            gaierr == EAI_ADDRFAMILY ||
> >>> +#endif
> >>>              gaierr == EAI_FAMILY ||
> >>
> >> I'm not the biggest-fan of mid-expression #ifdefs. Can we rewrite this
> >> to look more like:
> >>
> >> #ifndef EAI_ADDRFAMILY
> >> #define EAI_ADDRFAMILY EAI_FAMILY
> >> #endif
> >>
> >> and leave the conditional expression unchanged?
> > 
> > I think that'll cause gcc  6 to whine about you checking the same
> > value twice in the conditional, like how it complains that EWOULDBLOCK
> > and EAGAIN are the same.
> 
> Oh, right. That's annoying.  What about:
> 
> #ifndef EAI_ADDRFAMILY
> #define EAI_ADDRFAMILY 0
> #endif
> 
> if ((EAI_ADDRFAMILY && gaierr == EAIADDRFAMILY) ||
>     gaierr == EAI_FAMILY...
> 
> to shut up gcc 6, while still hoisting the preprocessor logic outside of
> the expression?

To be honest, I think the preprocessor check inside the expression isn't
a big deal and clearer than playing games like this.


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

Re: [Qemu-devel] [PATCH] io: fix build on FreeBSD

[Ed Maste]

On 25 February 2016 at 11:41, Daniel P. Berrange <berrange@redhat.com> wrote:
> On Thu, Feb 25, 2016 at 09:37:18AM -0700, Eric Blake wrote:
>>
>> Oh, right. That's annoying.  What about:
>>
>> #ifndef EAI_ADDRFAMILY
>> #define EAI_ADDRFAMILY 0
>> #endif
>>
>> if ((EAI_ADDRFAMILY && gaierr == EAIADDRFAMILY) ||
>>     gaierr == EAI_FAMILY...
>>
>> to shut up gcc 6, while still hoisting the preprocessor logic outside of
>> the expression?
>
> To be honest, I think the preprocessor check inside the expression isn't
> a big deal and clearer than playing games like this.

I wasn't a fan of putting the preprocessor check inside the expression
either, but no clear and concise alternative came to mind.  I think
it's easier to see both intent and effect with the preoprocessor check
than with the above.