motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unused QemuOpts parameter from net init functions

Browse source 
v1->v2:
- unchanged

v2->v3:
- keep "qemu-option.h" included in "net/slirp.h"

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Laszlo Ersek 2012-07-17 16:17:21 +02:00 • committed by Stefan Hajnoczi
parent f79b51b081
commit 1a0c09583d
12 changed files with 32 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/dump.c
View file

@ -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;

5
net/dump.h
View file

@ -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 */

4
net/slirp.c
View file

@ -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;

4
net/slirp.h
View file

@ -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);

4
net/socket.c
View file

@ -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;

5
net/socket.h
View file

@ -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 */

4
net/tap-win32.c
View file

@ -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;

8
net/tap.c
View file

@ -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;

9
net/tap.h
View file

@ -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 */

4
net/vde.c
View file

@ -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;

5
net/vde.h
View file

@ -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 */