haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: purge the monitor object from all init functions 

The only backend that really uses it is the socket one, which calls
monitor_get_fd(). But it can use 'cur_mon' instead.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-By: Laszlo Ersek <lersek@redhat.com>
stable-1.2
Luiz Capitulino 2012-04-12 13:20:40 -03:00
parent 60d5666f7d
commit 42dcc547e1
15 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/pci-hotplug.c
View File

@ -60,7 +60,7 @@ static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
qemu_opt_set(opts, "type", "nic"); qemu_opt_set(opts, "type", "nic");
ret = net_client_init(mon, opts, 0); ret = net_client_init(opts, 0);
if (ret < 0) if (ret < 0)
return NULL; return NULL;
if (nd_table[ret].devaddr) { if (nd_table[ret].devaddr) {

2
hw/usb/dev-network.c
View File

@ -1367,7 +1367,7 @@ static USBDevice *usb_net_init(USBBus *bus, const char *cmdline)
qemu_opt_set(opts, "type", "nic"); qemu_opt_set(opts, "type", "nic");
qemu_opt_set(opts, "model", "usb"); qemu_opt_set(opts, "model", "usb");
idx = net_client_init(NULL, opts, 0); idx = net_client_init(opts, 0);
if (idx == -1) { if (idx == -1) {
return NULL; return NULL;
} }

18
net.c
View File

@ -745,10 +745,7 @@ int net_handle_fd_param(Monitor *mon, const char *param)
return fd; return fd;
} }
static int net_init_nic(QemuOpts *opts, static int net_init_nic(QemuOpts *opts, const char *name, VLANState *vlan)
Monitor *mon,
const char *name,
VLANState *vlan)
{ {
int idx; int idx;
NICInfo *nd; NICInfo *nd;
@ -821,7 +818,6 @@ static int net_init_nic(QemuOpts *opts,
} }
typedef int (*net_client_init_func)(QemuOpts *opts, typedef int (*net_client_init_func)(QemuOpts *opts,
Monitor *mon,
const char *name, const char *name,
VLANState *vlan); VLANState *vlan);
@ -1085,7 +1081,7 @@ static const struct {
#endif /* CONFIG_NET_BRIDGE */ #endif /* CONFIG_NET_BRIDGE */
}; };
int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev) int net_client_init(QemuOpts *opts, int is_netdev)
{ {
const char *name; const char *name;
const char *type; const char *type;
@ -1156,7 +1152,7 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev)
ret = 0; ret = 0;
if (net_client_types[i].init) { if (net_client_types[i].init) {
ret = net_client_types[i].init(opts, mon, name, vlan); ret = net_client_types[i].init(opts, name, vlan);
if (ret < 0) { if (ret < 0) {
/* TODO push error reporting into init() methods */ /* TODO push error reporting into init() methods */
qerror_report(QERR_DEVICE_INIT_FAILED, type); qerror_report(QERR_DEVICE_INIT_FAILED, type);
@ -1213,7 +1209,7 @@ void net_host_device_add(Monitor *mon, const QDict *qdict)
qemu_opt_set(opts, "type", device); qemu_opt_set(opts, "type", device);
if (net_client_init(mon, opts, 0) < 0) { if (net_client_init(opts, 0) < 0) {
monitor_printf(mon, "adding host network device %s failed\n", device); monitor_printf(mon, "adding host network device %s failed\n", device);
} }
} }
@ -1248,7 +1244,7 @@ int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data)
return -1; return -1;
} }
res = net_client_init(mon, opts, 1); res = net_client_init(opts, 1);
if (res < 0) { if (res < 0) {
qemu_opts_del(opts); qemu_opts_del(opts);
} }
@ -1431,14 +1427,14 @@ void net_check_clients(void)
static int net_init_client(QemuOpts *opts, void *dummy) static int net_init_client(QemuOpts *opts, void *dummy)
{ {
if (net_client_init(NULL, opts, 0) < 0) if (net_client_init(opts, 0) < 0)
return -1; return -1;
return 0; return 0;
} }
static int net_init_netdev(QemuOpts *opts, void *dummy) static int net_init_netdev(QemuOpts *opts, void *dummy)
{ {
return net_client_init(NULL, opts, 1); return net_client_init(opts, 1);
} }
int net_init_clients(void) int net_init_clients(void)

2
net.h
View File

@ -163,7 +163,7 @@ struct HCIInfo *qemu_next_hci(void);
extern const char *legacy_tftp_prefix; extern const char *legacy_tftp_prefix;
extern const char *legacy_bootp_filename; extern const char *legacy_bootp_filename;
int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev); int net_client_init(QemuOpts *opts, int is_netdev);
int net_client_parse(QemuOptsList *opts_list, const char *str); int net_client_parse(QemuOptsList *opts_list, const char *str);
int net_init_clients(void); int net_init_clients(void);
void net_check_clients(void); void net_check_clients(void);

2
net/dump.c
View File

@ -144,7 +144,7 @@ static int net_dump_init(VLANState *vlan, const char *device,
return 0; return 0;
} }
int net_init_dump(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan) int net_init_dump(QemuOpts *opts, const char *name, VLANState *vlan)
{ {
int len; int len;
const char *file; const char *file;

3
net/dump.h
View File

@ -27,7 +27,6 @@
#include "net.h" #include "net.h"
#include "qemu-common.h" #include "qemu-common.h"
int net_init_dump(QemuOpts *opts, Monitor *mon, int net_init_dump(QemuOpts *opts, const char *name, VLANState *vlan);
const char *name, VLANState *vlan);
#endif /* QEMU_NET_DUMP_H */ #endif /* QEMU_NET_DUMP_H */

5
net/slirp.c
View File

@ -676,10 +676,7 @@ static int net_init_slirp_configs(const char *name, const char *value, void *opa
return 0; return 0;
} }
int net_init_slirp(QemuOpts *opts, int net_init_slirp(QemuOpts *opts, const char *name, VLANState *vlan)
Monitor *mon,
const char *name,
VLANState *vlan)
{ {
struct slirp_config_str *config; struct slirp_config_str *config;
const char *vhost; const char *vhost;

5
net/slirp.h
View File

@ -30,10 +30,7 @@
#ifdef CONFIG_SLIRP #ifdef CONFIG_SLIRP
int net_init_slirp(QemuOpts *opts, int net_init_slirp(QemuOpts *opts, const char *name, VLANState *vlan);
Monitor *mon,
const char *name,
VLANState *vlan);
void net_slirp_hostfwd_add(Monitor *mon, const QDict *qdict); void net_slirp_hostfwd_add(Monitor *mon, const QDict *qdict);
void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict); void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict);

8
net/socket.c
View File

@ -26,6 +26,7 @@
#include "config-host.h" #include "config-host.h"
#include "net.h" #include "net.h"
#include "monitor.h"
#include "qemu-char.h" #include "qemu-char.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-error.h" #include "qemu-error.h"
@ -585,10 +586,7 @@ static int net_socket_udp_init(VLANState *vlan,
return 0; return 0;
} }
int net_init_socket(QemuOpts *opts, int net_init_socket(QemuOpts *opts, const char *name, VLANState *vlan)
Monitor *mon,
const char *name,
VLANState *vlan)
{ {
if (qemu_opt_get(opts, "fd")) { if (qemu_opt_get(opts, "fd")) {
int fd; int fd;
@ -601,7 +599,7 @@ int net_init_socket(QemuOpts *opts,
return -1; return -1;
} }
fd = net_handle_fd_param(mon, qemu_opt_get(opts, "fd")); fd = net_handle_fd_param(cur_mon, qemu_opt_get(opts, "fd"));
if (fd == -1) { if (fd == -1) {
return -1; return -1;
} }

3
net/socket.h
View File

@ -27,7 +27,6 @@
#include "net.h" #include "net.h"
#include "qemu-common.h" #include "qemu-common.h"
int net_init_socket(QemuOpts *opts, Monitor *mon, int net_init_socket(QemuOpts *opts, const char *name, VLANState *vlan);
const char *name, VLANState *vlan);
#endif /* QEMU_NET_SOCKET_H */ #endif /* QEMU_NET_SOCKET_H */

2
net/tap-win32.c
View File

@ -699,7 +699,7 @@ static int tap_win32_init(VLANState *vlan, const char *model,
return 0; return 0;
} }
int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan) int net_init_tap(QemuOpts *opts, const char *name, VLANState *vlan)
{ {
const char *ifname; const char *ifname;

9
net/tap.c
View File

@ -512,8 +512,7 @@ static int net_bridge_run_helper(const char *helper, const char *bridge)
return -1; return -1;
} }
int net_init_bridge(QemuOpts *opts, Monitor *mon, const char *name, int net_init_bridge(QemuOpts *opts, const char *name, VLANState *vlan)
VLANState *vlan)
{ {
TAPState *s; TAPState *s;
int fd, vnet_hdr; int fd, vnet_hdr;
@ -583,7 +582,7 @@ static int net_tap_init(QemuOpts *opts, int *vnet_hdr)
return fd; return fd;
} }
int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan) int net_init_tap(QemuOpts *opts, const char *name, VLANState *vlan)
{ {
TAPState *s; TAPState *s;
int fd, vnet_hdr = 0; int fd, vnet_hdr = 0;
@ -600,7 +599,7 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
return -1; return -1;
} }
fd = net_handle_fd_param(mon, qemu_opt_get(opts, "fd")); fd = net_handle_fd_param(cur_mon, qemu_opt_get(opts, "fd"));
if (fd == -1) { if (fd == -1) {
return -1; return -1;
} }
@ -687,7 +686,7 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
int vhostfd, r; int vhostfd, r;
bool force = qemu_opt_get_bool(opts, "vhostforce", false); bool force = qemu_opt_get_bool(opts, "vhostforce", false);
if (qemu_opt_get(opts, "vhostfd")) { if (qemu_opt_get(opts, "vhostfd")) {
r = net_handle_fd_param(mon, qemu_opt_get(opts, "vhostfd")); r = net_handle_fd_param(cur_mon, qemu_opt_get(opts, "vhostfd"));
if (r == -1) { if (r == -1) {
return -1; return -1;
} }

5
net/tap.h
View File

@ -32,7 +32,7 @@
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" #define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" #define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan); int net_init_tap(QemuOpts *opts, const char *name, VLANState *vlan);
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required); int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required);
@ -57,7 +57,6 @@ int tap_get_fd(VLANClientState *vc);
struct vhost_net; struct vhost_net;
struct vhost_net *tap_get_vhost_net(VLANClientState *vc); struct vhost_net *tap_get_vhost_net(VLANClientState *vc);
int net_init_bridge(QemuOpts *opts, Monitor *mon, const char *name, int net_init_bridge(QemuOpts *opts, const char *name, VLANState *vlan);
VLANState *vlan);
#endif /* QEMU_NET_TAP_H */ #endif /* QEMU_NET_TAP_H */

2
net/vde.c
View File

@ -110,7 +110,7 @@ static int net_vde_init(VLANState *vlan, const char *model,
return 0; return 0;
} }
int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan) int net_init_vde(QemuOpts *opts, const char *name, VLANState *vlan)
{ {
const char *sock; const char *sock;
const char *group; const char *group;

2
net/vde.h
View File

@ -29,7 +29,7 @@
#ifdef CONFIG_VDE #ifdef CONFIG_VDE
int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan); int net_init_vde(QemuOpts *opts, const char *name, VLANState *vlan);
#endif /* CONFIG_VDE */ #endif /* CONFIG_VDE */