From nobody Fri Apr 11 16:00:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622089581; cv=none; d=zohomail.com; s=zohoarc; b=UwgMdZw6aC4lOseh/46cRfQa2ik0m5QdWdLCT5SpY6L6IwbMxAk75TseIO2HXL4GbltBRoBuNZxKzi6wN801+IThjIBFGYK5iXJCCRYqNJBhZMfutGDoI/wWWEDcMi2C5BrZeIctvGmisVui9oqdkMNUIHjSElU/94Y7x2O7U/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622089581; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=HPynzdeO8BdRoN5xpoq7ZjQTmKMhksHSADXDDdIjYWc=; b=oCXRoKCHSuP0r8rogrUkW0L8oWu22kq/CQDHPbl+aTafdmKhzCFQ8gg1W0GG5ZBinTXg0395+VeY1KY7nf5OvXlFGK9PEkWt8B4i0vS2n62wlKc/lQPQ+C16NfjLGncg53EFUxMCDUwnNXeNE7gJYi/H5hZjH5A4zNhiIN9RlGU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none 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 1622089581743834.568454290307; Wed, 26 May 2021 21:26:21 -0700 (PDT) Received: from localhost ([::1]:38018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lm7bA-0004oO-Mn for importer@patchew.org; Thu, 27 May 2021 00:26:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lm7Zl-0002kh-Fp for qemu-devel@nongnu.org; Thu, 27 May 2021 00:24:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39706) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lm7Zj-00064z-VX for qemu-devel@nongnu.org; Thu, 27 May 2021 00:24:53 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-380-hMoX4lxvOIioguvrOCeunQ-1; Thu, 27 May 2021 00:24:49 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A290800D55; Thu, 27 May 2021 04:24:48 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-13-43.pek2.redhat.com [10.72.13.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF4DA5D6D3; Thu, 27 May 2021 04:24:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622089491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=HPynzdeO8BdRoN5xpoq7ZjQTmKMhksHSADXDDdIjYWc=; b=Ey1ZGUN15b5ZxMC8hMiF9OnK4TGhUX76rhhTL5kuxTs4PyxaetTrngIFcakV/9hDEFxVbK HryqcaoFvgB8EJJ1Ht72lspXnezbrJ8PlmAmif/NGZ2Mks7eNtqXrhtQC2tO/2mGQiziHN rSH6K9y3zzYYqDwm/07t3Pan5QaABTs= X-MC-Unique: hMoX4lxvOIioguvrOCeunQ-1 From: Jason Wang To: peter.maydell@linaro.org Subject: [PULL V2 3/3] tap-bsd: Remove special casing for older OpenBSD releases Date: Thu, 27 May 2021 12:24:38 +0800 Message-Id: <1622089478-5426-4-git-send-email-jasowang@redhat.com> In-Reply-To: <1622089478-5426-1-git-send-email-jasowang@redhat.com> References: <1622089478-5426-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Jason Wang , qemu-devel@nongnu.org, Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Brad Smith OpenBSD added support for tap(4) 10 releases ago. Remove the special casing for older releases. Signed-off-by: Brad Smith Signed-off-by: Jason Wang --- net/tap-bsd.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 77aaf67..59dfcdf 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) { --=20 2.7.4