[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/24] Clean up legacy code in net_client_init()
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 20/24] Clean up legacy code in net_client_init() |
Date: |
Wed, 23 Sep 2009 11:24:19 +0100 |
Now that we've ported everything over to QemuOpts, we can kill off
all the cruft in net_client_init().
Note, the 'channel' type requires special handling as it uses a
format that QemuOpts can't parse
Signed-off-by: Mark McLoughlin <address@hidden>
---
net.c | 56 +++++++++++---------------------------------------------
1 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/net.c b/net.c
index 1ba9a3d..8da5eba 100644
--- a/net.c
+++ b/net.c
@@ -3026,39 +3026,7 @@ static int net_client_init_from_opts(Monitor *mon,
QemuOpts *opts)
int net_client_init(Monitor *mon, const char *device, const char *p)
{
- char buf[1024];
- int vlan_id, ret;
- VLANState *vlan;
- char *name = NULL;
-
- if (!strcmp(device, "none") ||
- !strcmp(device, "nic") ||
- !strcmp(device, "user") ||
- !strcmp(device, "tap") ||
- !strcmp(device, "socket") ||
- !strcmp(device, "vde") ||
- !strcmp(device, "dump")) {
- QemuOpts *opts;
-
- 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);
- }
-
- vlan_id = 0;
- if (get_param_value(buf, sizeof(buf), "vlan", p)) {
- vlan_id = strtol(buf, NULL, 0);
- }
- vlan = qemu_find_vlan(vlan_id, 1);
-
- if (get_param_value(buf, sizeof(buf), "name", p)) {
- name = qemu_strdup(buf);
- }
+ QemuOpts *opts;
#ifdef CONFIG_SLIRP
if (!strcmp(device, "channel")) {
@@ -3073,20 +3041,18 @@ int net_client_init(Monitor *mon, const char *device,
const char *p)
} else {
slirp_guestfwd(QTAILQ_FIRST(&slirp_stacks), mon, p, 1);
}
- ret = 0;
- } else
-#endif
- {
- config_error(mon, "Unknown network device: %s\n", device);
- ret = -1;
- goto out;
+ return 0;
}
- if (ret < 0) {
- config_error(mon, "Could not initialize device '%s'\n", device);
+#endif
+
+ opts = qemu_opts_parse(&qemu_net_opts, p, NULL);
+ if (!opts) {
+ return -1;
}
-out:
- qemu_free(name);
- return ret;
+
+ qemu_opt_set(opts, "type", device);
+
+ return net_client_init_from_opts(mon, opts);
}
void net_client_uninit(NICInfo *nd)
--
1.6.2.5
- [Qemu-devel] [PATCH 00/19 v2] Port -net to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 01/24] Use qemu_strdup() for NICInfo string fields, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 04/24] Correctly free nd structure, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 20/24] Clean up legacy code in net_client_init(),
Mark McLoughlin <=
- [Qemu-devel] [PATCH 11/24] Add qemu_opts_validate() for post parsing validation, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 02/24] Don't assign a static string to NICInfo::model, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 03/24] Make NICInfo string fields non-const, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 10/24] Make qemu_opts_parse() handle empty strings, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 09/24] Remove double error message for -device option parsing, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 13/24] Add qemu_net_opts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 23/24] Port PCI NIC hotplug to QemuOpts, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 06/24] Fix coding style issue, Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 08/24] Remove double error message in qemu_option_set(), Mark McLoughlin, 2009/09/23
- [Qemu-devel] [PATCH 22/24] Port usb net to QemuOpts, Mark McLoughlin, 2009/09/23