From patchwork Thu Mar 31 12:51:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 604120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qbPXj5J8qz9sRB for ; Thu, 31 Mar 2016 23:51:49 +1100 (AEDT) Received: from localhost ([::1]:60228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alc4i-0001vf-0f for incoming@patchwork.ozlabs.org; Thu, 31 Mar 2016 08:51:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) id 1alc4K-0002v5-4a for qemu-devel@nongnu.org; Thu, 31 Mar 2016 08:51:24 -0400 X-IronPort-AV: E=Sophos;i="5.24,422,1454972400"; d="scan'208";a="211381497" Received: from nat-inria-bordeaux-52-gw-01-bso.bordeaux.inria.fr (HELO var.youpi.perso.aquilenet.fr) ([194.199.1.52]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/AES128-GCM-SHA256; 31 Mar 2016 14:51:22 +0200 Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.87) (envelope-from ) id 1alc4I-00007s-E7; Thu, 31 Mar 2016 14:51:22 +0200 Date: Thu, 31 Mar 2016 14:51:22 +0200 From: Samuel Thibault To: Peter Maydell Message-ID: <20160331125122.GA2636@var.bordeaux.inria.fr> References: <1459416020-19011-1-git-send-email-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.134.164.83 Cc: "J. Kiszka" , QEMU Developers Subject: Re: [Qemu-devel] [PULL 0/5] ipv4-only and ipv6-only support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Peter Maydell, on Thu 31 Mar 2016 13:47:28 +0100, wrote: > On 31 March 2016 at 10:20, Samuel Thibault 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; }