From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53626)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <samuel.thibault@ens-lyon.org>) id 1alc4N-0001bJ-LI
	for qemu-devel@nongnu.org; Thu, 31 Mar 2016 08:51:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <samuel.thibault@ens-lyon.org>) id 1alc4K-0002vd-Em
	for qemu-devel@nongnu.org; Thu, 31 Mar 2016 08:51:27 -0400
Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:4949)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <samuel.thibault@ens-lyon.org>) id 1alc4K-0002v5-4a
	for qemu-devel@nongnu.org; Thu, 31 Mar 2016 08:51:24 -0400
Date: Thu, 31 Mar 2016 14:51:22 +0200
From: Samuel Thibault <samuel.thibault@gnu.org>
Message-ID: <20160331125122.GA2636@var.bordeaux.inria.fr>
References: <1459416020-19011-1-git-send-email-samuel.thibault@ens-lyon.org>
	<CAFEAcA-HNVBxS_Nb9zvzrd4qXwTHbPNEWiaTfBUeS1SeLCQr7g@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAFEAcA-HNVBxS_Nb9zvzrd4qXwTHbPNEWiaTfBUeS1SeLCQr7g@mail.gmail.com>
Subject: Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "J. Kiszka" <jan.kiszka@siemens.com>, QEMU Developers <qemu-devel@nongnu.org>

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?

Samuel

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;
 }