| Message ID | 20160331125122.GA2636@var.bordeaux.inria.fr |
|---|---|
| State | New |
| Headers | show |
On 31 March 2016 at 13:51, Samuel Thibault <samuel.thibault@gnu.org> wrote: > Peter Maydell, on Thu 31 Mar 2016 13:47:28 +0100, wrote: >> On 31 March 2016 at 10:20, Samuel Thibault <samuel.thibault@ens-lyon.org> wrote: >> > Update version for v2.6.0-rc0 release (2016-03-30 19:25:40 +0100) >> > >> > are available in the git repository at: >> > >> > http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault-2 >> > >> > for you to fetch changes up to c99751f2a711e9eecf60901520c6d4197bdaf9b4: >> > >> > slirp: Add RDNSS advertisement (2016-03-31 11:18:13 +0200) >> > >> > ---------------------------------------------------------------- >> > slirp updates (2) >> > >> > ---------------------------------------------------------------- >> > Samuel Thibault (5): >> > slirp: Allow disabling IPv4 or IPv6 >> > slirp: Split get_dns_addr >> > slirp: Add dns6 resolution >> > slirp: Support link-local DNS addresses >> > slirp: Add RDNSS advertisement >> >> Hi. I'm afraid this doesn't build for Windows: > > Indeed, I forgot to fix the the windows version of the function, could > you try with the attached change? I'm afraid that's not sufficient: /home/petmay01/linaro/qemu-for-merges/slirp/slirp.c:53:24: error: ‘dns6_addr’ defined but not used [-Werror=unused-variable] static struct in6_addr dns6_addr; ^ /home/petmay01/linaro/qemu-for-merges/slirp/slirp.c:55:14: error: ‘dns6_addr_time’ defined but not used [-Werror=unused-variable] static u_int dns6_addr_time; ^ cc1: all warnings being treated as errors make: *** [slirp/slirp.o] Error 1 make: *** Waiting for unfinished jobs.... /home/petmay01/linaro/qemu-for-merges/slirp/socket.c: In function ‘sotranslate_out’: /home/petmay01/linaro/qemu-for-merges/slirp/socket.c:799:17: error: passing argument 2 of ‘get_dns6_addr’ from incompatible pointer type [-Werror] if (get_dns6_addr(&sin6->sin6_addr, &sin6->sin6_scope_id) < 0) { ^ In file included from /home/petmay01/linaro/qemu-for-merges/slirp/slirp.h:99:0, from /home/petmay01/linaro/qemu-for-merges/slirp/socket.c:10: /home/petmay01/linaro/qemu-for-merges/slirp/libslirp.h:10:5: note: expected ‘unsigned int *’ but argument is of type ‘u_long *’ int get_dns6_addr(struct in6_addr *pdns6_addr, unsigned *scope_id); ^ cc1: all warnings being treated as errors thanks -- PMM
diff --git a/slirp/slirp.c b/slirp/slirp.c index c00fa32..bf268c8 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -106,7 +106,7 @@ int get_dns_addr(struct in_addr *pdns_addr) return 0; } -int get_dns6_addr(struct in6_addr *pdns_addr6) +int get_dns6_addr(struct in6_addr *pdns6_addr, unsigned *scope_id) { return -1; }