From patchwork Tue Oct 6 11:17:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 35096 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 549BCB7B8F for ; Tue, 6 Oct 2009 23:02:59 +1100 (EST) Received: from localhost ([127.0.0.1]:51620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mv8kq-0004X6-01 for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2009 08:02:56 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mv84N-0006vz-Ff for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:19:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mv84H-0006rJ-Ld for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:19:01 -0400 Received: from [199.232.76.173] (port=40409 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mv84E-0006qL-Ut for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:18:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24027) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mv84E-0007sa-AX for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:18:54 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n96BIr9N017685 for ; Tue, 6 Oct 2009 07:18:53 -0400 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n96BIqRJ032523; Tue, 6 Oct 2009 07:18:53 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id 3C0234EC6D; Tue, 6 Oct 2009 12:17:20 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Tue, 6 Oct 2009 12:17:16 +0100 Message-Id: <1254827836-11021-27-git-send-email-markmc@redhat.com> In-Reply-To: <1254827783.2720.42.camel@blaa> References: <1254827783.2720.42.camel@blaa> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH] Final net cleanup after conversion to QemuOpts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hw/pci-hotplug.c | 2 +- net.c | 116 +++++++++++++++++++++++++++--------------------------- net.h | 5 +- vl.c | 28 ++----------- 4 files changed, 65 insertions(+), 86 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index b5d532d..dcb5f0f 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -51,7 +51,7 @@ static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, qemu_opt_set(opts, "type", "nic"); - ret = net_client_init_from_opts(mon, opts); + ret = net_client_init(mon, opts); if (ret < 0) return NULL; if (nd_table[ret].devaddr) { diff --git a/net.c b/net.c index c8c8c78..2e4dd58 100644 --- a/net.c +++ b/net.c @@ -3001,7 +3001,7 @@ static struct { { /* end of list */ } }; -int net_client_init_from_opts(Monitor *mon, QemuOpts *opts) +int net_client_init(Monitor *mon, QemuOpts *opts) { const char *type; int i; @@ -3030,41 +3030,6 @@ int net_client_init_from_opts(Monitor *mon, QemuOpts *opts) return -1; } -int net_client_init(Monitor *mon, const char *device, const char *p) -{ - QemuOpts *opts; - -#ifdef CONFIG_SLIRP - if (!strcmp(device, "channel")) { - int ret; - - if (QTAILQ_EMPTY(&slirp_stacks)) { - struct slirp_config_str *config; - - config = qemu_malloc(sizeof(*config)); - pstrcpy(config->str, sizeof(config->str), p); - config->flags = SLIRP_CFG_LEGACY; - config->next = slirp_configs; - slirp_configs = config; - ret = 0; - } else { - ret = slirp_guestfwd(QTAILQ_FIRST(&slirp_stacks), p, 1); - } - - return ret; - } -#endif - - opts = qemu_opts_parse(&qemu_net_opts, p, NULL); - if (!opts) { - return -1; - } - - qemu_opt_set(opts, "type", device); - - return net_client_init_from_opts(mon, opts); -} - void net_client_uninit(NICInfo *nd) { nd->vlan->nb_guest_devs--; @@ -3118,7 +3083,7 @@ void net_host_device_add(Monitor *mon, const QDict *qdict) qemu_opt_set(opts, "type", device); - if (net_client_init_from_opts(mon, opts) < 0) { + if (net_client_init(mon, opts) < 0) { monitor_printf(mon, "adding host network device %s failed\n", device); } } @@ -3140,26 +3105,6 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict) qemu_del_vlan_client(vc); } -int net_client_parse(const char *str) -{ - const char *p; - char *q; - char device[64]; - - p = str; - q = device; - while (*p != '\0' && *p != ',') { - if ((q - device) < sizeof(device) - 1) - *q++ = *p; - p++; - } - *q = '\0'; - if (*p == ',') - p++; - - return net_client_init(NULL, device, p); -} - void net_set_boot_mask(int net_boot_mask) { int i; @@ -3240,7 +3185,7 @@ void net_cleanup(void) } } -void net_client_check(void) +static void net_check_clients(void) { VLANState *vlan; @@ -3255,3 +3200,58 @@ void net_client_check(void) vlan->id); } } + +static int net_init_client(QemuOpts *opts, void *dummy) +{ + return net_client_init(NULL, opts); +} + +int net_init_clients(void) +{ + if (QTAILQ_EMPTY(&qemu_net_opts.head)) { + /* if no clients, we use a default config */ + qemu_opts_set(&qemu_net_opts, NULL, "type", "nic"); +#ifdef CONFIG_SLIRP + qemu_opts_set(&qemu_net_opts, NULL, "type", "user"); +#endif + } + + if (qemu_opts_foreach(&qemu_net_opts, net_init_client, NULL, 1) == -1) { + return -1; + } + + net_check_clients(); + + return 0; +} + +int net_client_parse(const char *optarg) +{ + /* handle legacy -net channel,port:chr */ + if (!strncmp(optarg, "channel,", strlen("channel,"))) { + int ret; + + optarg += strlen("channel,"); + + if (QTAILQ_EMPTY(&slirp_stacks)) { + struct slirp_config_str *config; + + config = qemu_malloc(sizeof(*config)); + pstrcpy(config->str, sizeof(config->str), optarg); + config->flags = SLIRP_CFG_LEGACY; + config->next = slirp_configs; + slirp_configs = config; + ret = 0; + } else { + ret = slirp_guestfwd(QTAILQ_FIRST(&slirp_stacks), optarg, 1); + } + + return ret; + } + + if (!qemu_opts_parse(&qemu_net_opts, optarg, "type")) { + return -1; + } + + return 0; +} diff --git a/net.h b/net.h index 27a1c50..2b0ed9b 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); diff --git a/vl.c b/vl.c index 70d1aed..a5a56af 100644 --- a/vl.c +++ b/vl.c @@ -2604,7 +2604,7 @@ static int usb_device_add(const char *devname, int is_hotplug) qemu_opt_set(opts, "type", "nic"); qemu_opt_set(opts, "model", "usb"); - idx = net_client_init_from_opts(NULL, opts); + idx = net_client_init(NULL, opts); if (idx == -1) { return -1; } @@ -4536,8 +4536,6 @@ int qemu_uuid_parse(const char *str, uint8_t *uuid) return 0; } -#define MAX_NET_CLIENTS 32 - #ifndef _WIN32 static void termsig_handler(int signal) @@ -4741,8 +4739,6 @@ int main(int argc, char **argv, char **envp) DisplayState *ds; DisplayChangeListener *dcl; int cyls, heads, secs, translation; - const char *net_clients[MAX_NET_CLIENTS]; - int nb_net_clients; QemuOpts *hda_opts = NULL, *opts; int optind; const char *r, *optarg; @@ -4845,7 +4841,6 @@ int main(int argc, char **argv, char **envp) node_cpumask[i] = 0; } - nb_net_clients = 0; nb_numa_nodes = 0; nb_nics = 0; @@ -5091,12 +5086,9 @@ int main(int argc, char **argv, char **envp) break; #endif case QEMU_OPTION_net: - if (nb_net_clients >= MAX_NET_CLIENTS) { - fprintf(stderr, "qemu: too many network clients\n"); + if (net_client_parse(optarg) == -1) { exit(1); } - net_clients[nb_net_clients] = optarg; - nb_net_clients++; break; #ifdef CONFIG_SLIRP case QEMU_OPTION_tftp: @@ -5656,25 +5648,13 @@ int main(int argc, char **argv, char **envp) socket_init(); #endif - /* init network clients */ - if (nb_net_clients == 0) { - /* if no clients, we use a default config */ - net_clients[nb_net_clients++] = "nic"; -#ifdef CONFIG_SLIRP - net_clients[nb_net_clients++] = "user"; -#endif - } - - for(i = 0;i < nb_net_clients; i++) { - if (net_client_parse(net_clients[i]) < 0) - exit(1); + if (net_init_clients() < 0) { + exit(1); } net_boot = (boot_devices_bitmap >> ('n' - 'a')) & 0xF; net_set_boot_mask(net_boot); - net_client_check(); - /* init the bluetooth world */ if (foreach_device_config(DEV_BT, bt_parse)) exit(1);