From nobody Fri May 3 04:06:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491221179041390.7170681479424; Mon, 3 Apr 2017 05:06:19 -0700 (PDT) Received: from localhost ([::1]:59009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cv0kT-0007tu-KR for importer@patchew.org; Mon, 03 Apr 2017 08:06:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cv0ji-0007bW-AZ for qemu-devel@nongnu.org; Mon, 03 Apr 2017 08:05:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cv0jf-00081I-5x for qemu-devel@nongnu.org; Mon, 03 Apr 2017 08:05:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55422) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cv0je-000815-Tl for qemu-devel@nongnu.org; Mon, 03 Apr 2017 08:05:27 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE8222E604D for ; Mon, 3 Apr 2017 12:05:22 +0000 (UTC) Received: from thh440s.str.redhat.com (dhcp-192-189.str.redhat.com [10.33.192.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44A4018252; Mon, 3 Apr 2017 12:05:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DE8222E604D Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com DE8222E604D From: Thomas Huth To: Jason Wang , qemu-devel@nongnu.org Date: Mon, 3 Apr 2017 14:05:16 +0200 Message-Id: <1491221116-11776-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 03 Apr 2017 12:05:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.10] net/tap: Replace tap-haiku.c and tap-aix.c by a generic tap-stub.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The files tap-haiku.c and tap-aix.c are identical (except one line of error message). We should avoid such code duplication, so replace these by a generic tap-stub.c file instead. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- net/Makefile.objs | 15 ++++---- net/tap-haiku.c | 87 ---------------------------------------= ---- net/{tap-aix.c =3D> tap-stub.c} | 3 +- 3 files changed, 9 insertions(+), 96 deletions(-) delete mode 100644 net/tap-haiku.c rename net/{tap-aix.c =3D> tap-stub.c} (97%) diff --git a/net/Makefile.objs b/net/Makefile.objs index 2e2fd43..67ba5e2 100644 --- a/net/Makefile.objs +++ b/net/Makefile.objs @@ -3,13 +3,7 @@ common-obj-y +=3D socket.o common-obj-y +=3D dump.o common-obj-y +=3D eth.o common-obj-$(CONFIG_L2TPV3) +=3D l2tpv3.o -common-obj-$(CONFIG_POSIX) +=3D tap.o vhost-user.o -common-obj-$(CONFIG_LINUX) +=3D tap-linux.o -common-obj-$(CONFIG_WIN32) +=3D tap-win32.o -common-obj-$(CONFIG_BSD) +=3D tap-bsd.o -common-obj-$(CONFIG_SOLARIS) +=3D tap-solaris.o -common-obj-$(CONFIG_AIX) +=3D tap-aix.o -common-obj-$(CONFIG_HAIKU) +=3D tap-haiku.o +common-obj-$(CONFIG_POSIX) +=3D vhost-user.o common-obj-$(CONFIG_SLIRP) +=3D slirp.o common-obj-$(CONFIG_VDE) +=3D vde.o common-obj-$(CONFIG_NETMAP) +=3D netmap.o @@ -20,3 +14,10 @@ common-obj-y +=3D colo-compare.o common-obj-y +=3D colo.o common-obj-y +=3D filter-rewriter.o common-obj-y +=3D filter-replay.o + +tap-obj-$(CONFIG_LINUX) =3D tap-linux.o +tap-obj-$(CONFIG_BSD) =3D tap-bsd.o +tap-obj-$(CONFIG_SOLARIS) =3D tap-solaris.o +tap-obj-y ?=3D tap-stub.o +common-obj-$(CONFIG_POSIX) +=3D tap.o $(tap-obj-y) +common-obj-$(CONFIG_WIN32) +=3D tap-win32.o diff --git a/net/tap-haiku.c b/net/tap-haiku.c deleted file mode 100644 index b27e57e..0000000 --- a/net/tap-haiku.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * QEMU System Emulator - * - * Copyright (c) 2003-2008 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -#include "qemu/osdep.h" -#include "qapi/error.h" -#include "tap_int.h" - -int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required, Error **errp) -{ - error_setg(errp, "no tap on Haiku"); - return -1; -} - -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) -{ -} - -int tap_probe_vnet_hdr(int fd) -{ - return 0; -} - -int tap_probe_has_ufo(int fd) -{ - return 0; -} - -int tap_probe_vnet_hdr_len(int fd, int len) -{ - return 0; -} - -void tap_fd_set_vnet_hdr_len(int fd, int len) -{ -} - -int tap_fd_set_vnet_le(int fd, int is_le) -{ - return -EINVAL; -} - -int tap_fd_set_vnet_be(int fd, int is_be) -{ - return -EINVAL; -} - -void tap_fd_set_offload(int fd, int csum, int tso4, - int tso6, int ecn, int ufo) -{ -} - -int tap_fd_enable(int fd) -{ - return -1; -} - -int tap_fd_disable(int fd) -{ - return -1; -} - -int tap_fd_get_ifname(int fd, char *ifname) -{ - return -1; -} diff --git a/net/tap-aix.c b/net/tap-stub.c similarity index 97% rename from net/tap-aix.c rename to net/tap-stub.c index 0e6da63..a9ab8f8 100644 --- a/net/tap-aix.c +++ b/net/tap-stub.c @@ -29,7 +29,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required, int mq_required, Error **errp) { - error_setg(errp, "no tap on AIX"); + error_setg(errp, "tap is not supported in this build"); return -1; } =20 @@ -85,4 +85,3 @@ int tap_fd_get_ifname(int fd, char *ifname) { return -1; } - --=20 1.8.3.1