From patchwork Mon Jul 12 19:20:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Di Ciurcio Filho X-Patchwork-Id: 58661 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 751C5B6F11 for ; Tue, 13 Jul 2010 05:25:45 +1000 (EST) Received: from localhost ([127.0.0.1]:57183 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYOdE-0003o6-Oc for incoming@patchwork.ozlabs.org; Mon, 12 Jul 2010 15:25:36 -0400 Received: from [140.186.70.92] (port=37539 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYOZH-0001eL-Pd for qemu-devel@nongnu.org; Mon, 12 Jul 2010 15:21:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYOZG-0003sa-Hy for qemu-devel@nongnu.org; Mon, 12 Jul 2010 15:21:31 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:44975) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYOZG-0003rP-Fj for qemu-devel@nongnu.org; Mon, 12 Jul 2010 15:21:30 -0400 Received: by mail-gy0-f173.google.com with SMTP id 2so2918762gyf.4 for ; Mon, 12 Jul 2010 12:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=7SblaaiZjylX3Mf2IFbF5kj3xNskai7+lVxy+BhU0Qc=; b=GIcwPA81tlG7AJ8bsjXOscdXCz6er2vm+L4JUdDwh+81DHJPo8aM2V9QDE2yRMYJx2 VZdWXujgDTh5T4rxf6e9CxfNvou1eU9m6nG/pPRcVaAeMW5sx8LvfmjcfHj1fjqAHWIM Y3f/JFo0NQGkTdyNfAxTH8CfRb/ljCh9JmVLI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=KBbsK7Y4soknLclFOFXF5DXgJKhRPUhJSPxCD3CmW0Q63gyxSaxCdyr0gH3H6T8A/b NBjVz01PnoXUcwrbEuJrAblTgFlZGMC/b1HU2Wr8hgp+T8LFB+hDF9W9Cr37OfU5dlfo z+wbGUp0soKJNpnhPW3P3ZBP4Ci+KpJ/ObXOE= Received: by 10.100.172.20 with SMTP id u20mr15645550ane.239.1278962490231; Mon, 12 Jul 2010 12:21:30 -0700 (PDT) Received: from localhost.localdomain ([143.106.7.130]) by mx.google.com with ESMTPS id p9sm55284904anf.26.2010.07.12.12.21.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 12 Jul 2010 12:21:29 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Mon, 12 Jul 2010 16:20:48 -0300 Message-Id: <1278962453-15774-4-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278962453-15774-1-git-send-email-miguel.filho@gmail.com> References: <1278962453-15774-1-git-send-email-miguel.filho@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Miguel Di Ciurcio Filho , avi@redhat.com Subject: [Qemu-devel] [PATCH 3/8] vlan cleanup: do not depend on socket and dump X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- net.c | 42 ------------------------------------------ 1 files changed, 0 insertions(+), 42 deletions(-) diff --git a/net.c b/net.c index 8ddf872..addd167 100644 --- a/net.c +++ b/net.c @@ -26,8 +26,6 @@ #include "config-host.h" #include "net/tap.h" -#include "net/socket.h" -#include "net/dump.h" #include "net/slirp.h" #include "net/vde.h" #include "net/util.h" @@ -988,30 +986,6 @@ static const struct { #endif /* _WIN32 */ { /* end of list */ } }, - }, { - .type = "socket", - .init = net_init_socket, - .desc = { - NET_COMMON_PARAMS_DESC, - { - .name = "fd", - .type = QEMU_OPT_STRING, - .help = "file descriptor of an already opened socket", - }, { - .name = "listen", - .type = QEMU_OPT_STRING, - .help = "port number, and optional hostname, to listen on", - }, { - .name = "connect", - .type = QEMU_OPT_STRING, - .help = "port number, and optional hostname, to connect to", - }, { - .name = "mcast", - .type = QEMU_OPT_STRING, - .help = "UDP multicast address and port number", - }, - { /* end of list */ } - }, #ifdef CONFIG_VDE }, { .type = "vde", @@ -1038,22 +1012,6 @@ static const struct { { /* end of list */ } }, #endif - }, { - .type = "dump", - .init = net_init_dump, - .desc = { - NET_COMMON_PARAMS_DESC, - { - .name = "len", - .type = QEMU_OPT_SIZE, - .help = "per-packet size limit (64k default)", - }, { - .name = "file", - .type = QEMU_OPT_STRING, - .help = "dump file path (default is qemu-vlan0.pcap)", - }, - { /* end of list */ } - }, }, { /* end of list */ } };