diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/dump.c | 3 | ||||
| -rw-r--r-- | net/dump.h | 4 | ||||
| -rw-r--r-- | net/slirp.c | 3 | ||||
| -rw-r--r-- | net/slirp.h | 4 | ||||
| -rw-r--r-- | net/socket.c | 3 | ||||
| -rw-r--r-- | net/socket.h | 4 | ||||
| -rw-r--r-- | net/tap-win32.c | 3 | ||||
| -rw-r--r-- | net/tap.c | 6 | ||||
| -rw-r--r-- | net/tap.h | 7 | ||||
| -rw-r--r-- | net/vde.c | 3 | ||||
| -rw-r--r-- | net/vde.h | 4 |
11 files changed, 31 insertions, 13 deletions
diff --git a/net/dump.c b/net/dump.c index 2124b9a081..27e95280e3 100644 --- a/net/dump.c +++ b/net/dump.c @@ -144,7 +144,8 @@ static int net_dump_init(VLANState *vlan, const char *device, return 0; } -int net_init_dump(QemuOpts *opts, const char *name, VLANState *vlan) +int net_init_dump(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan) { int len; const char *file; diff --git a/net/dump.h b/net/dump.h index 2b5d9ba644..85ac00be2c 100644 --- a/net/dump.h +++ b/net/dump.h @@ -26,7 +26,9 @@ #include "net.h" #include "qemu-common.h" +#include "qapi-types.h" -int net_init_dump(QemuOpts *opts, const char *name, VLANState *vlan); +int net_init_dump(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan); #endif /* QEMU_NET_DUMP_H */ diff --git a/net/slirp.c b/net/slirp.c index 1f63d50ed7..1243d43926 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -708,7 +708,8 @@ static int net_init_slirp_configs(const char *name, const char *value, void *opa return 0; } -int net_init_slirp(QemuOpts *opts, const char *name, VLANState *vlan) +int net_init_slirp(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan) { struct slirp_config_str *config; const char *vhost; diff --git a/net/slirp.h b/net/slirp.h index 53fe95dc12..ef13a65e9c 100644 --- a/net/slirp.h +++ b/net/slirp.h @@ -27,10 +27,12 @@ #include "qemu-common.h" #include "qdict.h" #include "qemu-option.h" +#include "qapi-types.h" #ifdef CONFIG_SLIRP -int net_init_slirp(QemuOpts *opts, const char *name, VLANState *vlan); +int net_init_slirp(QemuOpts *opts, const NetClientOptions *new_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 30536efbaf..563447d02e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -586,7 +586,8 @@ static int net_socket_udp_init(VLANState *vlan, return 0; } -int net_init_socket(QemuOpts *opts, const char *name, VLANState *vlan) +int net_init_socket(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan) { if (qemu_opt_get(opts, "fd")) { int fd; diff --git a/net/socket.h b/net/socket.h index e1fe959412..e44d26ea9e 100644 --- a/net/socket.h +++ b/net/socket.h @@ -26,7 +26,9 @@ #include "net.h" #include "qemu-common.h" +#include "qapi-types.h" -int net_init_socket(QemuOpts *opts, const char *name, VLANState *vlan); +int net_init_socket(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan); #endif /* QEMU_NET_SOCKET_H */ diff --git a/net/tap-win32.c b/net/tap-win32.c index f7b6129131..b738f45bd6 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -699,7 +699,8 @@ static int tap_win32_init(VLANState *vlan, const char *model, return 0; } -int net_init_tap(QemuOpts *opts, const char *name, VLANState *vlan) +int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan) { const char *ifname; @@ -513,7 +513,8 @@ static int net_bridge_run_helper(const char *helper, const char *bridge) return -1; } -int net_init_bridge(QemuOpts *opts, const char *name, VLANState *vlan) +int net_init_bridge(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan) { TAPState *s; int fd, vnet_hdr; @@ -583,7 +584,8 @@ static int net_tap_init(QemuOpts *opts, int *vnet_hdr) return fd; } -int net_init_tap(QemuOpts *opts, const char *name, VLANState *vlan) +int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan) { TAPState *s; int fd, vnet_hdr = 0; @@ -28,11 +28,13 @@ #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 char *name, VLANState *vlan); +int net_init_tap(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan); int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required); @@ -57,6 +59,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 char *name, VLANState *vlan); +int net_init_bridge(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan); #endif /* QEMU_NET_TAP_H */ @@ -110,7 +110,8 @@ static int net_vde_init(VLANState *vlan, const char *model, return 0; } -int net_init_vde(QemuOpts *opts, const char *name, VLANState *vlan) +int net_init_vde(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan) { const char *sock; const char *group; @@ -26,10 +26,12 @@ #include "qemu-common.h" #include "qemu-option.h" +#include "qapi-types.h" #ifdef CONFIG_VDE -int net_init_vde(QemuOpts *opts, const char *name, VLANState *vlan); +int net_init_vde(QemuOpts *opts, const NetClientOptions *new_opts, + const char *name, VLANState *vlan); #endif /* CONFIG_VDE */ |