[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 7f1c9d2] Port host_net_add monitor command to Qem
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 7f1c9d2] Port host_net_add monitor command to QemuOpts |
Date: |
Tue, 06 Oct 2009 20:05:46 -0000 |
From: Mark McLoughlin <address@hidden>
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>
Signed-off-by: Anthony Liguori <address@hidden>
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);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 7f1c9d2] Port host_net_add monitor command to QemuOpts,
Anthony Liguori <=