* [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD
@ 2016-08-15 0:46 Brad Smith
2016-08-15 6:53 ` Thomas Huth
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Brad Smith @ 2016-08-15 0:46 UTC (permalink / raw)
To: qemu-devel
Public bug reported:
The SLIRP code has regressed between 2.6 and 2.7 and now fails to build
on OpenBSD.
cc -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg/i386 -I. -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2 -I/home/ports/pobj/
qemu-2.7.0-rc2/qemu-2.7.0-rc2/include -Islirp -Islirp -I/usr/X11R6/include/pixman-1 -DHAS_LIBSSH2_SFTP_FSYNC -fPIE -DPIE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -W
strict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -I/usr/local/include -I/usr/X11R6/include -Wno-redundant-decls -D
TIME_MAX=LLONG_MAX -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style
-definition -Wtype-limits -fstack-protector-strong -I/usr/local/include -I/usr/local/include/p11-kit-1 -I/usr/include -I/usr/local/include -I/usr/local/include/libpng16 -I/usr/local/inc
lude/libusb-1.0 -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tests -MMD -MP -MT slirp/slirp.o -MF slirp/slirp.d -pthread -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/inclu
de -I/usr/local/include -O2 -pipe -c -o slirp/slirp.o slirp/slirp.c
In file included from /usr/include/net/if.h:454:0,
from slirp/slirp.c:34:
/usr/include/net/if_arp.h:47:8: error: redefinition of 'struct arphdr'
struct arphdr {
^
In file included from slirp/slirp.c:29:0:
slirp/slirp.h:108:8: note: originally defined here
struct arphdr {
^
slirp/slirp.c: In function 'arp_input':
slirp/slirp.c:790:15: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:790:29: error: 'struct arphdr' has no member named 'ar_sip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:792:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:792:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
slirp/slirp.c:796:16: error: 'struct arphdr' has no member named 'ar_tip'
if ((ah->ar_tip & slirp->vnetwork_mask.s_addr) ==
^
slirp/slirp.c:798:19: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == slirp->vnameserver_addr.s_addr ||
^
slirp/slirp.c:799:19: error: 'struct arphdr' has no member named 'ar_tip'
ah->ar_tip == slirp->vhost_addr.s_addr)
^
slirp/slirp.c:802:49: error: 'struct arphdr' has no member named 'ar_tip'
if (ex_ptr->ex_addr.s_addr == ah->ar_tip)
^
slirp/slirp.c:809:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:809:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:814:42: error: 'struct arphdr' has no member named 'ar_tip'
memcpy(&reh->h_source[2], &ah->ar_tip, 4);
^
slirp/slirp.c:822:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, reh->h_source, ETH_ALEN);
^
slirp/slirp.c:823:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:823:29: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:824:23: error: 'struct arphdr' has no member named 'ar_tha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
slirp/slirp.c:824:35: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
^
slirp/slirp.c:825:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:825:29: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:830:32: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:830:44: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c: In function 'if_encap4':
slirp/slirp.c:910:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, special_ethaddr, ETH_ALEN - 4);
^
slirp/slirp.c:911:24: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(&rah->ar_sha[2], &slirp->vhost_addr, 4);
^
slirp/slirp.c:914:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = slirp->vhost_addr.s_addr;
^
slirp/slirp.c:917:23: error: 'struct arphdr' has no member named 'ar_tha'
memset(rah->ar_tha, 0, ETH_ALEN);
^
slirp/slirp.c:920:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = iph->ip_dst.s_addr;
^
gmake: *** [/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/rules.mak:59: slirp/slirp.o] Error 1
*** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2674 '/home/ports/pobj/qemu-2.7.0-rc2/.build_done')
*** Error 1 in /home/ports/emulators/qemu (/home/ports/infrastructure/mk/bsd.port.mk:2396 'all')
** Affects: qemu
Importance: Undecided
Status: New
--
You received this bug notification because you are a member of qemu-
devel-ml, which is subscribed to QEMU.
https://bugs.launchpad.net/bugs/1613133
Title:
SLIRP code regression fails to build on OpenBSD
Status in QEMU:
New
Bug description:
The SLIRP code has regressed between 2.6 and 2.7 and now fails to
build on OpenBSD.
cc -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg/i386 -I. -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2 -I/home/ports/pobj/
qemu-2.7.0-rc2/qemu-2.7.0-rc2/include -Islirp -Islirp -I/usr/X11R6/include/pixman-1 -DHAS_LIBSSH2_SFTP_FSYNC -fPIE -DPIE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -W
strict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -I/usr/local/include -I/usr/X11R6/include -Wno-redundant-decls -D
TIME_MAX=LLONG_MAX -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style
-definition -Wtype-limits -fstack-protector-strong -I/usr/local/include -I/usr/local/include/p11-kit-1 -I/usr/include -I/usr/local/include -I/usr/local/include/libpng16 -I/usr/local/inc
lude/libusb-1.0 -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tests -MMD -MP -MT slirp/slirp.o -MF slirp/slirp.d -pthread -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/inclu
de -I/usr/local/include -O2 -pipe -c -o slirp/slirp.o slirp/slirp.c
In file included from /usr/include/net/if.h:454:0,
from slirp/slirp.c:34:
/usr/include/net/if_arp.h:47:8: error: redefinition of 'struct arphdr'
struct arphdr {
^
In file included from slirp/slirp.c:29:0:
slirp/slirp.h:108:8: note: originally defined here
struct arphdr {
^
slirp/slirp.c: In function 'arp_input':
slirp/slirp.c:790:15: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:790:29: error: 'struct arphdr' has no member named 'ar_sip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:792:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:792:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
slirp/slirp.c:796:16: error: 'struct arphdr' has no member named 'ar_tip'
if ((ah->ar_tip & slirp->vnetwork_mask.s_addr) ==
^
slirp/slirp.c:798:19: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == slirp->vnameserver_addr.s_addr ||
^
slirp/slirp.c:799:19: error: 'struct arphdr' has no member named 'ar_tip'
ah->ar_tip == slirp->vhost_addr.s_addr)
^
slirp/slirp.c:802:49: error: 'struct arphdr' has no member named 'ar_tip'
if (ex_ptr->ex_addr.s_addr == ah->ar_tip)
^
slirp/slirp.c:809:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:809:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:814:42: error: 'struct arphdr' has no member named 'ar_tip'
memcpy(&reh->h_source[2], &ah->ar_tip, 4);
^
slirp/slirp.c:822:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, reh->h_source, ETH_ALEN);
^
slirp/slirp.c:823:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:823:29: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:824:23: error: 'struct arphdr' has no member named 'ar_tha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
slirp/slirp.c:824:35: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
^
slirp/slirp.c:825:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:825:29: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:830:32: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:830:44: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c: In function 'if_encap4':
slirp/slirp.c:910:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, special_ethaddr, ETH_ALEN - 4);
^
slirp/slirp.c:911:24: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(&rah->ar_sha[2], &slirp->vhost_addr, 4);
^
slirp/slirp.c:914:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = slirp->vhost_addr.s_addr;
^
slirp/slirp.c:917:23: error: 'struct arphdr' has no member named 'ar_tha'
memset(rah->ar_tha, 0, ETH_ALEN);
^
slirp/slirp.c:920:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = iph->ip_dst.s_addr;
^
gmake: *** [/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/rules.mak:59: slirp/slirp.o] Error 1
*** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2674 '/home/ports/pobj/qemu-2.7.0-rc2/.build_done')
*** Error 1 in /home/ports/emulators/qemu (/home/ports/infrastructure/mk/bsd.port.mk:2396 'all')
To manage notifications about this bug go to:
https://bugs.launchpad.net/qemu/+bug/1613133/+subscriptions
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD
2016-08-15 0:46 [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD Brad Smith
@ 2016-08-15 6:53 ` Thomas Huth
2016-08-15 7:15 ` Paolo Bonzini
2016-08-16 10:17 ` [Qemu-devel] [Bug 1613133] " T. Huth
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Thomas Huth @ 2016-08-15 6:53 UTC (permalink / raw)
To: Bug 1613133, qemu-devel; +Cc: Samuel Thibault
On 15.08.2016 02:46, Brad Smith wrote:
> Public bug reported:
>
> The SLIRP code has regressed between 2.6 and 2.7 and now fails to build
> on OpenBSD.
[...]
> In file included from /usr/include/net/if.h:454:0,
> from slirp/slirp.c:34:
> /usr/include/net/if_arp.h:47:8: error: redefinition of 'struct arphdr'
> struct arphdr {
> ^
> In file included from slirp/slirp.c:29:0:
> slirp/slirp.h:108:8: note: originally defined here
> struct arphdr {
> ^
Does it work again if you change the
#ifndef _WIN32
#include <net/if.h>
#endif
into
#if !defined(_WIN32) && !defined(__OpenBSD__)
#include <net/if.h>
#endif
at the beginning of slirp/slirp.c ?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD
2016-08-15 6:53 ` Thomas Huth
@ 2016-08-15 7:15 ` Paolo Bonzini
2016-08-15 8:27 ` Thomas Huth
0 siblings, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2016-08-15 7:15 UTC (permalink / raw)
To: Thomas Huth, Bug 1613133, qemu-devel; +Cc: Samuel Thibault
On 15/08/2016 08:53, Thomas Huth wrote:
> On 15.08.2016 02:46, Brad Smith wrote:
>> Public bug reported:
>>
>> The SLIRP code has regressed between 2.6 and 2.7 and now fails to build
>> on OpenBSD.
> [...]
>> In file included from /usr/include/net/if.h:454:0,
>> from slirp/slirp.c:34:
>> /usr/include/net/if_arp.h:47:8: error: redefinition of 'struct arphdr'
>> struct arphdr {
>> ^
>> In file included from slirp/slirp.c:29:0:
>> slirp/slirp.h:108:8: note: originally defined here
>> struct arphdr {
>> ^
>
> Does it work again if you change the
>
> #ifndef _WIN32
> #include <net/if.h>
> #endif
>
> into
>
> #if !defined(_WIN32) && !defined(__OpenBSD__)
> #include <net/if.h>
> #endif
>
> at the beginning of slirp/slirp.c ?
>
>
Can the struct be renamed to struct slirp_arphdr instead?
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD
2016-08-15 7:15 ` Paolo Bonzini
@ 2016-08-15 8:27 ` Thomas Huth
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Huth @ 2016-08-15 8:27 UTC (permalink / raw)
To: Paolo Bonzini, Bug 1613133, qemu-devel; +Cc: Samuel Thibault
On 15.08.2016 09:15, Paolo Bonzini wrote:
>
>
> On 15/08/2016 08:53, Thomas Huth wrote:
>> On 15.08.2016 02:46, Brad Smith wrote:
>>> Public bug reported:
>>>
>>> The SLIRP code has regressed between 2.6 and 2.7 and now fails to build
>>> on OpenBSD.
>> [...]
>>> In file included from /usr/include/net/if.h:454:0,
>>> from slirp/slirp.c:34:
>>> /usr/include/net/if_arp.h:47:8: error: redefinition of 'struct arphdr'
>>> struct arphdr {
>>> ^
>>> In file included from slirp/slirp.c:29:0:
>>> slirp/slirp.h:108:8: note: originally defined here
>>> struct arphdr {
>>> ^
>>
>> Does it work again if you change the
>>
>> #ifndef _WIN32
>> #include <net/if.h>
>> #endif
>>
>> into
>>
>> #if !defined(_WIN32) && !defined(__OpenBSD__)
>> #include <net/if.h>
>> #endif
>>
>> at the beginning of slirp/slirp.c ?
>
> Can the struct be renamed to struct slirp_arphdr instead?
Agreed, that's likely the more robust solution (though a slightly bigger
diff). I've just sent a patch with such a renaming...
Thomas
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [Bug 1613133] Re: SLIRP code regression fails to build on OpenBSD
2016-08-15 0:46 [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD Brad Smith
2016-08-15 6:53 ` Thomas Huth
@ 2016-08-16 10:17 ` T. Huth
2016-08-16 17:02 ` T. Huth
2016-09-02 20:59 ` T. Huth
3 siblings, 0 replies; 7+ messages in thread
From: T. Huth @ 2016-08-16 10:17 UTC (permalink / raw)
To: qemu-devel
Patch suggested here: http://patchwork.ozlabs.org/patch/659132/
--
You received this bug notification because you are a member of qemu-
devel-ml, which is subscribed to QEMU.
https://bugs.launchpad.net/bugs/1613133
Title:
SLIRP code regression fails to build on OpenBSD
Status in QEMU:
New
Bug description:
The SLIRP code has regressed between 2.6 and 2.7 and now fails to
build on OpenBSD.
cc -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg/i386 -I. -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2 -I/home/ports/pobj/
qemu-2.7.0-rc2/qemu-2.7.0-rc2/include -Islirp -Islirp -I/usr/X11R6/include/pixman-1 -DHAS_LIBSSH2_SFTP_FSYNC -fPIE -DPIE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -W
strict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -I/usr/local/include -I/usr/X11R6/include -Wno-redundant-decls -D
TIME_MAX=LLONG_MAX -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style
-definition -Wtype-limits -fstack-protector-strong -I/usr/local/include -I/usr/local/include/p11-kit-1 -I/usr/include -I/usr/local/include -I/usr/local/include/libpng16 -I/usr/local/inc
lude/libusb-1.0 -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tests -MMD -MP -MT slirp/slirp.o -MF slirp/slirp.d -pthread -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/inclu
de -I/usr/local/include -O2 -pipe -c -o slirp/slirp.o slirp/slirp.c
In file included from /usr/include/net/if.h:454:0,
from slirp/slirp.c:34:
/usr/include/net/if_arp.h:47:8: error: redefinition of 'struct arphdr'
struct arphdr {
^
In file included from slirp/slirp.c:29:0:
slirp/slirp.h:108:8: note: originally defined here
struct arphdr {
^
slirp/slirp.c: In function 'arp_input':
slirp/slirp.c:790:15: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:790:29: error: 'struct arphdr' has no member named 'ar_sip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:792:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:792:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
slirp/slirp.c:796:16: error: 'struct arphdr' has no member named 'ar_tip'
if ((ah->ar_tip & slirp->vnetwork_mask.s_addr) ==
^
slirp/slirp.c:798:19: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == slirp->vnameserver_addr.s_addr ||
^
slirp/slirp.c:799:19: error: 'struct arphdr' has no member named 'ar_tip'
ah->ar_tip == slirp->vhost_addr.s_addr)
^
slirp/slirp.c:802:49: error: 'struct arphdr' has no member named 'ar_tip'
if (ex_ptr->ex_addr.s_addr == ah->ar_tip)
^
slirp/slirp.c:809:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:809:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:814:42: error: 'struct arphdr' has no member named 'ar_tip'
memcpy(&reh->h_source[2], &ah->ar_tip, 4);
^
slirp/slirp.c:822:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, reh->h_source, ETH_ALEN);
^
slirp/slirp.c:823:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:823:29: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:824:23: error: 'struct arphdr' has no member named 'ar_tha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
slirp/slirp.c:824:35: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
^
slirp/slirp.c:825:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:825:29: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:830:32: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:830:44: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c: In function 'if_encap4':
slirp/slirp.c:910:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, special_ethaddr, ETH_ALEN - 4);
^
slirp/slirp.c:911:24: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(&rah->ar_sha[2], &slirp->vhost_addr, 4);
^
slirp/slirp.c:914:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = slirp->vhost_addr.s_addr;
^
slirp/slirp.c:917:23: error: 'struct arphdr' has no member named 'ar_tha'
memset(rah->ar_tha, 0, ETH_ALEN);
^
slirp/slirp.c:920:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = iph->ip_dst.s_addr;
^
gmake: *** [/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/rules.mak:59: slirp/slirp.o] Error 1
*** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2674 '/home/ports/pobj/qemu-2.7.0-rc2/.build_done')
*** Error 1 in /home/ports/emulators/qemu (/home/ports/infrastructure/mk/bsd.port.mk:2396 'all')
To manage notifications about this bug go to:
https://bugs.launchpad.net/qemu/+bug/1613133/+subscriptions
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [Bug 1613133] Re: SLIRP code regression fails to build on OpenBSD
2016-08-15 0:46 [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD Brad Smith
2016-08-15 6:53 ` Thomas Huth
2016-08-16 10:17 ` [Qemu-devel] [Bug 1613133] " T. Huth
@ 2016-08-16 17:02 ` T. Huth
2016-09-02 20:59 ` T. Huth
3 siblings, 0 replies; 7+ messages in thread
From: T. Huth @ 2016-08-16 17:02 UTC (permalink / raw)
To: qemu-devel
** Changed in: qemu
Status: New => Fix Committed
--
You received this bug notification because you are a member of qemu-
devel-ml, which is subscribed to QEMU.
https://bugs.launchpad.net/bugs/1613133
Title:
SLIRP code regression fails to build on OpenBSD
Status in QEMU:
Fix Committed
Bug description:
The SLIRP code has regressed between 2.6 and 2.7 and now fails to
build on OpenBSD.
cc -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg/i386 -I. -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2 -I/home/ports/pobj/
qemu-2.7.0-rc2/qemu-2.7.0-rc2/include -Islirp -Islirp -I/usr/X11R6/include/pixman-1 -DHAS_LIBSSH2_SFTP_FSYNC -fPIE -DPIE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -W
strict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -I/usr/local/include -I/usr/X11R6/include -Wno-redundant-decls -D
TIME_MAX=LLONG_MAX -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style
-definition -Wtype-limits -fstack-protector-strong -I/usr/local/include -I/usr/local/include/p11-kit-1 -I/usr/include -I/usr/local/include -I/usr/local/include/libpng16 -I/usr/local/inc
lude/libusb-1.0 -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tests -MMD -MP -MT slirp/slirp.o -MF slirp/slirp.d -pthread -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/inclu
de -I/usr/local/include -O2 -pipe -c -o slirp/slirp.o slirp/slirp.c
In file included from /usr/include/net/if.h:454:0,
from slirp/slirp.c:34:
/usr/include/net/if_arp.h:47:8: error: redefinition of 'struct arphdr'
struct arphdr {
^
In file included from slirp/slirp.c:29:0:
slirp/slirp.h:108:8: note: originally defined here
struct arphdr {
^
slirp/slirp.c: In function 'arp_input':
slirp/slirp.c:790:15: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:790:29: error: 'struct arphdr' has no member named 'ar_sip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:792:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:792:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
slirp/slirp.c:796:16: error: 'struct arphdr' has no member named 'ar_tip'
if ((ah->ar_tip & slirp->vnetwork_mask.s_addr) ==
^
slirp/slirp.c:798:19: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == slirp->vnameserver_addr.s_addr ||
^
slirp/slirp.c:799:19: error: 'struct arphdr' has no member named 'ar_tip'
ah->ar_tip == slirp->vhost_addr.s_addr)
^
slirp/slirp.c:802:49: error: 'struct arphdr' has no member named 'ar_tip'
if (ex_ptr->ex_addr.s_addr == ah->ar_tip)
^
slirp/slirp.c:809:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:809:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:814:42: error: 'struct arphdr' has no member named 'ar_tip'
memcpy(&reh->h_source[2], &ah->ar_tip, 4);
^
slirp/slirp.c:822:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, reh->h_source, ETH_ALEN);
^
slirp/slirp.c:823:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:823:29: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:824:23: error: 'struct arphdr' has no member named 'ar_tha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
slirp/slirp.c:824:35: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
^
slirp/slirp.c:825:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:825:29: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:830:32: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:830:44: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c: In function 'if_encap4':
slirp/slirp.c:910:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, special_ethaddr, ETH_ALEN - 4);
^
slirp/slirp.c:911:24: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(&rah->ar_sha[2], &slirp->vhost_addr, 4);
^
slirp/slirp.c:914:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = slirp->vhost_addr.s_addr;
^
slirp/slirp.c:917:23: error: 'struct arphdr' has no member named 'ar_tha'
memset(rah->ar_tha, 0, ETH_ALEN);
^
slirp/slirp.c:920:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = iph->ip_dst.s_addr;
^
gmake: *** [/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/rules.mak:59: slirp/slirp.o] Error 1
*** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2674 '/home/ports/pobj/qemu-2.7.0-rc2/.build_done')
*** Error 1 in /home/ports/emulators/qemu (/home/ports/infrastructure/mk/bsd.port.mk:2396 'all')
To manage notifications about this bug go to:
https://bugs.launchpad.net/qemu/+bug/1613133/+subscriptions
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [Bug 1613133] Re: SLIRP code regression fails to build on OpenBSD
2016-08-15 0:46 [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD Brad Smith
` (2 preceding siblings ...)
2016-08-16 17:02 ` T. Huth
@ 2016-09-02 20:59 ` T. Huth
3 siblings, 0 replies; 7+ messages in thread
From: T. Huth @ 2016-09-02 20:59 UTC (permalink / raw)
To: qemu-devel
Fix has been included in QEMU v2.7.0:
http://git.qemu.org/?p=qemu.git;a=commitdiff;h=1f8b56e7cebc71d80a
** Changed in: qemu
Status: Fix Committed => Fix Released
--
You received this bug notification because you are a member of qemu-
devel-ml, which is subscribed to QEMU.
https://bugs.launchpad.net/bugs/1613133
Title:
SLIRP code regression fails to build on OpenBSD
Status in QEMU:
Fix Released
Bug description:
The SLIRP code has regressed between 2.6 and 2.7 and now fails to
build on OpenBSD.
cc -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tcg/i386 -I. -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2 -I/home/ports/pobj/
qemu-2.7.0-rc2/qemu-2.7.0-rc2/include -Islirp -Islirp -I/usr/X11R6/include/pixman-1 -DHAS_LIBSSH2_SFTP_FSYNC -fPIE -DPIE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -W
strict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -I/usr/local/include -I/usr/X11R6/include -Wno-redundant-decls -D
TIME_MAX=LLONG_MAX -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style
-definition -Wtype-limits -fstack-protector-strong -I/usr/local/include -I/usr/local/include/p11-kit-1 -I/usr/include -I/usr/local/include -I/usr/local/include/libpng16 -I/usr/local/inc
lude/libusb-1.0 -I/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/tests -MMD -MP -MT slirp/slirp.o -MF slirp/slirp.d -pthread -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/inclu
de -I/usr/local/include -O2 -pipe -c -o slirp/slirp.o slirp/slirp.c
In file included from /usr/include/net/if.h:454:0,
from slirp/slirp.c:34:
/usr/include/net/if_arp.h:47:8: error: redefinition of 'struct arphdr'
struct arphdr {
^
In file included from slirp/slirp.c:29:0:
slirp/slirp.h:108:8: note: originally defined here
struct arphdr {
^
slirp/slirp.c: In function 'arp_input':
slirp/slirp.c:790:15: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:790:29: error: 'struct arphdr' has no member named 'ar_sip'
if (ah->ar_tip == ah->ar_sip) {
^
slirp/slirp.c:792:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:792:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
slirp/slirp.c:796:16: error: 'struct arphdr' has no member named 'ar_tip'
if ((ah->ar_tip & slirp->vnetwork_mask.s_addr) ==
^
slirp/slirp.c:798:19: error: 'struct arphdr' has no member named 'ar_tip'
if (ah->ar_tip == slirp->vnameserver_addr.s_addr ||
^
slirp/slirp.c:799:19: error: 'struct arphdr' has no member named 'ar_tip'
ah->ar_tip == slirp->vhost_addr.s_addr)
^
slirp/slirp.c:802:49: error: 'struct arphdr' has no member named 'ar_tip'
if (ex_ptr->ex_addr.s_addr == ah->ar_tip)
^
slirp/slirp.c:809:36: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:809:48: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:814:42: error: 'struct arphdr' has no member named 'ar_tip'
memcpy(&reh->h_source[2], &ah->ar_tip, 4);
^
slirp/slirp.c:822:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, reh->h_source, ETH_ALEN);
^
slirp/slirp.c:823:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:823:29: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_sip = ah->ar_tip;
^
slirp/slirp.c:824:23: error: 'struct arphdr' has no member named 'ar_tha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
slirp/slirp.c:824:35: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
^
slirp/slirp.c:825:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:825:29: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_tip = ah->ar_sip;
^
slirp/slirp.c:830:32: error: 'struct arphdr' has no member named 'ar_sip'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c:830:44: error: 'struct arphdr' has no member named 'ar_sha'
arp_table_add(slirp, ah->ar_sip, ah->ar_sha);
^
slirp/slirp.c: In function 'if_encap4':
slirp/slirp.c:910:23: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(rah->ar_sha, special_ethaddr, ETH_ALEN - 4);
^
slirp/slirp.c:911:24: error: 'struct arphdr' has no member named 'ar_sha'
memcpy(&rah->ar_sha[2], &slirp->vhost_addr, 4);
^
slirp/slirp.c:914:16: error: 'struct arphdr' has no member named 'ar_sip'
rah->ar_sip = slirp->vhost_addr.s_addr;
^
slirp/slirp.c:917:23: error: 'struct arphdr' has no member named 'ar_tha'
memset(rah->ar_tha, 0, ETH_ALEN);
^
slirp/slirp.c:920:16: error: 'struct arphdr' has no member named 'ar_tip'
rah->ar_tip = iph->ip_dst.s_addr;
^
gmake: *** [/home/ports/pobj/qemu-2.7.0-rc2/qemu-2.7.0-rc2/rules.mak:59: slirp/slirp.o] Error 1
*** Error 2 in . (/home/ports/infrastructure/mk/bsd.port.mk:2674 '/home/ports/pobj/qemu-2.7.0-rc2/.build_done')
*** Error 1 in /home/ports/emulators/qemu (/home/ports/infrastructure/mk/bsd.port.mk:2396 'all')
To manage notifications about this bug go to:
https://bugs.launchpad.net/qemu/+bug/1613133/+subscriptions
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-09-02 21:05 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-15 0:46 [Qemu-devel] [Bug 1613133] [NEW] SLIRP code regression fails to build on OpenBSD Brad Smith
2016-08-15 6:53 ` Thomas Huth
2016-08-15 7:15 ` Paolo Bonzini
2016-08-15 8:27 ` Thomas Huth
2016-08-16 10:17 ` [Qemu-devel] [Bug 1613133] " T. Huth
2016-08-16 17:02 ` T. Huth
2016-09-02 20:59 ` T. Huth
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.