From nobody Tue May 7 08:47:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=comstyle.com ARC-Seal: i=1; a=rsa-sha256; t=1616802629; cv=none; d=zohomail.com; s=zohoarc; b=hf/MgXc6857WvpmWqy8B+AUw+m5mlu5j79XHuPQk6dDPi3JRE3h0msVtu10ha7BUTM2rF0R/kOe268fQ30h7MGzGXdTjIUoi7p8YnVsr+5+Yq41SDo44wxOohYfe69KLX+b1O7Kh3sqQ/AixVV0XejCT9zHSoSmxE0JBfNeea64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616802629; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=V49LS+UEcqCW8cXdq8i6cIPgMuCA2OB0qQvzeE58QY0=; b=Y5wbsZSXFYYG78rnSyvrJM9nC6c1qzZlDJeW5Dodd7ycCzGI6bexglSbt+TFANuNjuS5W1SXzkK6G57zPNBM/JYgMKvOuL+OUER+CakTt4cFdp6uMWR/Jms5tk+eSMe0j5EWLw16/6ozYRBo1NPwuVK7vr5sHg4AMdoNW0GzwWE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161680262949229.817426976538513; Fri, 26 Mar 2021 16:50:29 -0700 (PDT) Received: from localhost ([::1]:44708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPwDk-000680-3w for importer@patchew.org; Fri, 26 Mar 2021 19:50:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPwCo-0005ij-PZ for qemu-devel@nongnu.org; Fri, 26 Mar 2021 19:49:30 -0400 Received: from speedy.comstyle.com ([2607:f938:3000:8::2]:1844 helo=mail.comstyle.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1lPwCn-0003Lq-Bx for qemu-devel@nongnu.org; Fri, 26 Mar 2021 19:49:30 -0400 Received: from mail.comstyle.com (localhost [127.0.0.1]) by mail.comstyle.com (Postfix) with ESMTP id 4F6dz95k3xz8PbP; Fri, 26 Mar 2021 19:51:17 -0400 (EDT) Received: from humpty.home.comstyle.com (bras-base-toroon2719w-grc-39-142-114-123-227.dsl.bell.ca [142.114.123.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: brad) by mail.comstyle.com (Postfix) with ESMTPSA id 4F6dz956Znz8PbN; Fri, 26 Mar 2021 19:51:17 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=comstyle.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=default; bh=SwNfJAQKMElcEMMgYRQkkr9CUYU=; b=Bd8tlyuaG1qEVf2+GRD9sc0VncTZ S5Vb/i+xit1NuWGGlB5X42ythdZScbHY2E6UnvjtsuXpuZKC5N2qvq90rzys+shI 6iJ/aA+1jwyuOZPJssRbjv7TI8ybItVVUQbZQ/JvXUSAbILBEHfKDuUigd59Og+A WkxukC3dpp2h+wc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=comstyle.com; h=date:from:to :cc:subject:message-id:mime-version:content-type; q=dns; s= default; b=KNmkI9jwMh4H07jHL12V6uGhe0Rt0zUwDwFwoouZrIRhcMsEELd4a +/1m/oMPBxGbjH5n2W8Bls4Ub2UE0eZ3X6GgiLHdVzUjsUf7jHsknLXMtzXFuHMA +jzbW0+jpDsnAGIi/RdWhIJgAVDwSgTaeI8hUcdE2cXhSm4seH/eY4= Date: Fri, 26 Mar 2021 19:49:12 -0400 From: Brad Smith To: qemu-devel@nongnu.org Cc: Jason Wang Subject: [PATCH] tap-bsd: Remove special casing for older OpenBSD releases Message-ID: MIME-Version: 1.0 Content-Disposition: inline Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f938:3000:8::2; envelope-from=brad@comstyle.com; helo=mail.comstyle.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @comstyle.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" OpenBSD added support for tap(4) 10 releases ago. Remove the special casing for older releases. Signed-off-by: Brad Smith diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 77aaf674b1..59dfcdfae0 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -35,10 +35,6 @@ #include #endif =20 -#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) @@ -59,11 +55,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hd= r, if (*ifname) { snprintf(dname, sizeof dname, "/dev/%s", ifname); } else { -#if defined(__OpenBSD__) && OpenBSD < 201605 - snprintf(dname, sizeof dname, "/dev/tun%d", i); -#else snprintf(dname, sizeof dname, "/dev/tap%d", i); -#endif } TFR(fd =3D open(dname, O_RDWR)); if (fd >=3D 0) {