From dc1c9fe8b759d4e70222d8f94838a6f6ef5c4ef1 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 6 Oct 2009 12:17:16 +0100 Subject: Final net cleanup after conversion to QemuOpts Now that net_client_init() has no users, kill it off and rename net_client_init_from_opts(). There is no further need for the old code in net_client_parse() either. We use qemu_opts_parse() 'firstname' facitity for that. Instead, move the special handling of the 'vmchannel' type there. Simplify the vl.c code into merely call net_client_parse() for each -net command line option and then calling net_init_clients() later to iterate over the options and create the clients. Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori --- net.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'net.h') diff --git a/net.h b/net.h index 27a1c501ae..2b0ed9ba96 100644 --- a/net.h +++ b/net.h @@ -136,16 +136,15 @@ void net_checksum_calculate(uint8_t *data, int length); extern const char *legacy_tftp_prefix; extern const char *legacy_bootp_filename; -int net_client_init(Monitor *mon, const char *device, const char *p); -int net_client_init_from_opts(Monitor *mon, QemuOpts *opts); +int net_client_init(Monitor *mon, QemuOpts *opts); void net_client_uninit(NICInfo *nd); int net_client_parse(const char *str); +int net_init_clients(void); int net_slirp_smb(const char *exported_dir); void net_slirp_hostfwd_add(Monitor *mon, const QDict *qdict); void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict); int net_slirp_redir(const char *redir_str); void net_cleanup(void); -void net_client_check(void); void net_set_boot_mask(int boot_mask); void net_host_device_add(Monitor *mon, const QDict *qdict); void net_host_device_remove(Monitor *mon, const QDict *qdict); -- cgit v1.2.3