Patchwork [3/8] vlan cleanup: do not depend on socket and dump

login
register
mail settings
Submitter Miguel Di Ciurcio Filho
Date July 12, 2010, 7:20 p.m.
Message ID <1278962453-15774-4-git-send-email-miguel.filho@gmail.com>
Download mbox | patch
Permalink /patch/58661/
State New
Headers show

Comments

Miguel Di Ciurcio Filho - July 12, 2010, 7:20 p.m.
---
 net.c |   42 ------------------------------------------
 1 files changed, 0 insertions(+), 42 deletions(-)

Patch

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 */ }
 };