[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] Port host_net_add monitor command to QemuOpts
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH] Port host_net_add monitor command to QemuOpts |
Date: |
Tue, 6 Oct 2009 12:17:13 +0100 |
Here is where we rely on qemu_opts_parse() to handle an empty string.
We could alternatively explicitly handle this here by using
qemu_opts_create() when we're not supplied any parameters, but its
cleaner this way.
Signed-off-by: Mark McLoughlin <address@hidden>
---
net.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/net.c b/net.c
index 534305c..1ebf147 100644
--- a/net.c
+++ b/net.c
@@ -3101,13 +3101,24 @@ static int net_host_check_device(const char *device)
void net_host_device_add(Monitor *mon, const QDict *qdict)
{
const char *device = qdict_get_str(qdict, "device");
- const char *opts = qdict_get_try_str(qdict, "opts");
+ const char *opts_str = qdict_get_try_str(qdict, "opts");
+ QemuOpts *opts;
if (!net_host_check_device(device)) {
monitor_printf(mon, "invalid host network device %s\n", device);
return;
}
- if (net_client_init(mon, device, opts ? opts : "") < 0) {
+
+ opts = qemu_opts_parse(&qemu_net_opts, opts_str ? opts_str : "", NULL);
+ if (!opts) {
+ monitor_printf(mon, "parsing network options '%s' failed\n",
+ opts_str ? opts_str : "");
+ return;
+ }
+
+ qemu_opt_set(opts, "type", device);
+
+ if (net_client_init_from_opts(mon, opts) < 0) {
monitor_printf(mon, "adding host network device %s failed\n", device);
}
}
--
1.6.2.5
- [Qemu-devel] [PATCH] Drop config_error(), use qemu_error() instead, (continued)
- [Qemu-devel] [PATCH] Drop config_error(), use qemu_error() instead, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Final net cleanup after conversion to QemuOpts, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Remove double error message for -device option parsing, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Never overwrite a QemuOpt, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Port -net vde to QemuOpts, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Port -net tap to QemuOpts, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Port usb net to QemuOpts, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Add qemu_net_opts, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Port -net user to QemuOpts, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Clean up legacy code in net_client_init(), Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Port host_net_add monitor command to QemuOpts,
Mark McLoughlin <=
- [Qemu-devel] [PATCH] Port -net dump to QemuOpts, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Port -net socket to QemuOpts, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Port PCI NIC hotplug to QemuOpts, Mark McLoughlin, 2009/10/06
- [Qemu-devel] [PATCH] Port -net none and -net nic to QemuOpts, Mark McLoughlin, 2009/10/06