From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzDtC-0000Kn-KJ for qemu-devel@nongnu.org; Tue, 25 Oct 2016 22:24:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzDtB-0000c1-PN for qemu-devel@nongnu.org; Tue, 25 Oct 2016 22:24:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44788) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzDtB-0000bv-Jl for qemu-devel@nongnu.org; Tue, 25 Oct 2016 22:24:25 -0400 From: Jason Wang Date: Wed, 26 Oct 2016 10:24:05 +0800 Message-Id: <1477448651-4474-4-git-send-email-jasowang@redhat.com> In-Reply-To: <1477448651-4474-1-git-send-email-jasowang@redhat.com> References: <1477448651-4474-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL 3/9] tap-bsd: OpenBSD uses tap(4) now List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Brad Smith , Jason Wang From: Brad Smith Update the tap-bsd code now that OpenBSD uses tap(4). Signed-off-by: Brad Smith Signed-off-by: Jason Wang --- net/tap-bsd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index c506ac3..6c96922 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -35,6 +35,10 @@ #include #endif +#if defined(__OpenBSD__) +#include +#endif + #ifndef __FreeBSD__ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required, int mq_required, Error **errp) @@ -55,7 +59,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, if (*ifname) { snprintf(dname, sizeof dname, "/dev/%s", ifname); } else { -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) && OpenBSD < 201605 snprintf(dname, sizeof dname, "/dev/tun%d", i); #else snprintf(dname, sizeof dname, "/dev/tap%d", i); -- 2.7.4