From 1a0c09583df097d62b0580f9073ba45c9d18351a Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 17 Jul 2012 16:17:21 +0200 Subject: remove unused QemuOpts parameter from net init functions v1->v2: - unchanged v2->v3: - keep "qemu-option.h" included in "net/slirp.h" Signed-off-by: Laszlo Ersek Signed-off-by: Stefan Hajnoczi --- net/dump.c | 4 ++-- net/dump.h | 5 ++--- net/slirp.c | 4 ++-- net/slirp.h | 4 ++-- net/socket.c | 4 ++-- net/socket.h | 5 ++--- net/tap-win32.c | 4 ++-- net/tap.c | 8 ++++---- net/tap.h | 9 ++++----- net/vde.c | 4 ++-- net/vde.h | 5 ++--- 11 files changed, 26 insertions(+), 30 deletions(-) (limited to 'net') diff --git a/net/dump.c b/net/dump.c index f3d2fa9875..b575430787 100644 --- a/net/dump.c +++ b/net/dump.c @@ -144,8 +144,8 @@ static int net_dump_init(VLANState *vlan, const char *device, return 0; } -int net_init_dump(QemuOpts *old_opts, const NetClientOptions *opts, - const char *name, VLANState *vlan) +int net_init_dump(const NetClientOptions *opts, const char *name, + VLANState *vlan) { int len; const char *file; diff --git a/net/dump.h b/net/dump.h index 85ac00be2c..0fa2dd72ca 100644 --- a/net/dump.h +++ b/net/dump.h @@ -25,10 +25,9 @@ #define QEMU_NET_DUMP_H #include "net.h" -#include "qemu-common.h" #include "qapi-types.h" -int net_init_dump(QemuOpts *opts, const NetClientOptions *new_opts, - const char *name, VLANState *vlan); +int net_init_dump(const NetClientOptions *opts, const char *name, + VLANState *vlan); #endif /* QEMU_NET_DUMP_H */ diff --git a/net/slirp.c b/net/slirp.c index 44b059f233..5c2e6b2cec 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -702,8 +702,8 @@ net_init_slirp_configs(const StringList *fwd, int flags) } } -int net_init_slirp(QemuOpts *old_opts, const NetClientOptions *opts, - const char *name, VLANState *vlan) +int net_init_slirp(const NetClientOptions *opts, const char *name, + VLANState *vlan) { struct slirp_config_str *config; char *vnet; diff --git a/net/slirp.h b/net/slirp.h index ef13a65e9c..e2c71eeca0 100644 --- a/net/slirp.h +++ b/net/slirp.h @@ -31,8 +31,8 @@ #ifdef CONFIG_SLIRP -int net_init_slirp(QemuOpts *opts, const NetClientOptions *new_opts, - const char *name, VLANState *vlan); +int net_init_slirp(const NetClientOptions *opts, const char *name, + VLANState *vlan); void net_slirp_hostfwd_add(Monitor *mon, const QDict *qdict); void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict); diff --git a/net/socket.c b/net/socket.c index e3cba20cd9..600c287d79 100644 --- a/net/socket.c +++ b/net/socket.c @@ -586,8 +586,8 @@ static int net_socket_udp_init(VLANState *vlan, return 0; } -int net_init_socket(QemuOpts *old_opts, const NetClientOptions *opts, - const char *name, VLANState *vlan) +int net_init_socket(const NetClientOptions *opts, const char *name, + VLANState *vlan) { const NetdevSocketOptions *sock; diff --git a/net/socket.h b/net/socket.h index e44d26ea9e..c4809ad0d9 100644 --- a/net/socket.h +++ b/net/socket.h @@ -25,10 +25,9 @@ #define QEMU_NET_SOCKET_H #include "net.h" -#include "qemu-common.h" #include "qapi-types.h" -int net_init_socket(QemuOpts *opts, const NetClientOptions *new_opts, - const char *name, VLANState *vlan); +int net_init_socket(const NetClientOptions *opts, const char *name, + VLANState *vlan); #endif /* QEMU_NET_SOCKET_H */ diff --git a/net/tap-win32.c b/net/tap-win32.c index b6099cd847..232807236a 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -699,8 +699,8 @@ static int tap_win32_init(VLANState *vlan, const char *model, return 0; } -int net_init_tap(QemuOpts *old_opts, const NetClientOptions *opts, - const char *name, VLANState *vlan) +int net_init_tap(const NetClientOptions *opts, const char *name, + VLANState *vlan) { const NetdevTapOptions *tap; diff --git a/net/tap.c b/net/tap.c index d2736eae76..72062275fe 100644 --- a/net/tap.c +++ b/net/tap.c @@ -513,8 +513,8 @@ static int net_bridge_run_helper(const char *helper, const char *bridge) return -1; } -int net_init_bridge(QemuOpts *old_opts, const NetClientOptions *opts, - const char *name, VLANState *vlan) +int net_init_bridge(const NetClientOptions *opts, const char *name, + VLANState *vlan) { const NetdevBridgeOptions *bridge; const char *helper, *br; @@ -586,8 +586,8 @@ static int net_tap_init(const NetdevTapOptions *tap, int *vnet_hdr, return fd; } -int net_init_tap(QemuOpts *old_opts, const NetClientOptions *opts, - const char *name, VLANState *vlan) +int net_init_tap(const NetClientOptions *opts, const char *name, + VLANState *vlan) { const NetdevTapOptions *tap; diff --git a/net/tap.h b/net/tap.h index f092129cef..19dea58dc5 100644 --- a/net/tap.h +++ b/net/tap.h @@ -27,14 +27,13 @@ #define QEMU_NET_TAP_H #include "qemu-common.h" -#include "qemu-option.h" #include "qapi-types.h" #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" -int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts, - const char *name, VLANState *vlan); +int net_init_tap(const NetClientOptions *opts, const char *name, + VLANState *vlan); int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required); @@ -59,7 +58,7 @@ int tap_get_fd(VLANClientState *vc); struct vhost_net; struct vhost_net *tap_get_vhost_net(VLANClientState *vc); -int net_init_bridge(QemuOpts *opts, const NetClientOptions *new_opts, - const char *name, VLANState *vlan); +int net_init_bridge(const NetClientOptions *opts, const char *name, + VLANState *vlan); #endif /* QEMU_NET_TAP_H */ diff --git a/net/vde.c b/net/vde.c index 703888c503..ee19f5c42c 100644 --- a/net/vde.c +++ b/net/vde.c @@ -110,8 +110,8 @@ static int net_vde_init(VLANState *vlan, const char *model, return 0; } -int net_init_vde(QemuOpts *old_opts, const NetClientOptions *opts, - const char *name, VLANState *vlan) +int net_init_vde(const NetClientOptions *opts, const char *name, + VLANState *vlan) { const NetdevVdeOptions *vde; diff --git a/net/vde.h b/net/vde.h index 5fc17f980e..ad502ef4de 100644 --- a/net/vde.h +++ b/net/vde.h @@ -25,13 +25,12 @@ #define QEMU_NET_VDE_H #include "qemu-common.h" -#include "qemu-option.h" #include "qapi-types.h" #ifdef CONFIG_VDE -int net_init_vde(QemuOpts *opts, const NetClientOptions *new_opts, - const char *name, VLANState *vlan); +int net_init_vde(const NetClientOptions *opts, const char *name, + VLANState *vlan); #endif /* CONFIG_VDE */ -- cgit v1.2.3-55-g7522