mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port host_net_add monitor command to QemuOpts

Browse Source 
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 <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin 2009-10-06 12:17:13 +01:00 committed by Anthony Liguori
parent 7b3fb25110
commit 7f1c9d20ea
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net.c
View File

@ -3101,13 +3101,24 @@ static int net_host_check_device(const char *device)
void net_host_device_add(Monitor *mon, const QDict *qdict) void net_host_device_add(Monitor *mon, const QDict *qdict)
{ {
const char *device = qdict_get_str(qdict, "device"); 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)) { if (!net_host_check_device(device)) {
monitor_printf(mon, "invalid host network device %s\n", device); monitor_printf(mon, "invalid host network device %s\n", device);
return; 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); monitor_printf(mon, "adding host network device %s failed\n", device);
} }
} }