[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/19] Clean up legacy code in net_client_init()
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 15/19] Clean up legacy code in net_client_init() |
Date: |
Thu, 10 Sep 2009 16:18:57 +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 54483b4..14271ff 100644
--- a/net.c
+++ b/net.c
@@ -3005,38 +3005,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")) {
@@ -3051,20 +3020,17 @@ int net_client_init(Monitor *mon, const char *device,
const char *p)
} else {
slirp_guestfwd(TAILQ_FIRST(&slirp_stacks), mon, p, 1);
}
- ret = 0;
- } else
-#endif
- {
- config_error(mon, "Unknown network device: %s\n", device);
- ret = -1;
- goto out;
- }
- if (ret < 0) {
- config_error(mon, "Could not initialize device '%s'\n", device);
+ return 0;
}
-out:
- qemu_free(name);
- 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)
--
1.6.2.5
- Re: [Qemu-devel] [PATCH 06/19] Add qemu_opts_validate() for post parsing validation, (continued)
[Qemu-devel] [PATCH 10/19] Port -net user to QemuOpts, Mark McLoughlin, 2009/09/10
[Qemu-devel] [PATCH 09/19] Port -net none and -net nic to QemuOpts, Mark McLoughlin, 2009/09/10
[Qemu-devel] [PATCH 16/19] Port host_net_add monitor command to QemuOpts, Mark McLoughlin, 2009/09/10
[Qemu-devel] [PATCH 14/19] Port -net dump to QemuOpts, Mark McLoughlin, 2009/09/10
[Qemu-devel] [PATCH 17/19] Port usb net to QemuOpts, Mark McLoughlin, 2009/09/10
[Qemu-devel] [PATCH 15/19] Clean up legacy code in net_client_init(),
Mark McLoughlin <=
[Qemu-devel] [PATCH 13/19] Port -net vde to QemuOpts, Mark McLoughlin, 2009/09/10
[Qemu-devel] [PATCH 19/19] Final net cleanup after conversion to QemuOpts, Mark McLoughlin, 2009/09/10
Re: [Qemu-devel] [PATCH 00/19] Port -net to QemuOpts, Mark McLoughlin, 2009/09/18