diff options
author | Mark McLoughlin <markmc@redhat.com> | 2009-10-08 14:21:12 +0100 |
---|---|---|
committer | Mark McLoughlin <markmc@redhat.com> | 2009-10-08 14:21:12 +0100 |
commit | 219ad804f358d0aec3555f6b060978601885bc7c (patch) | |
tree | 7aaf538d4f49b6dcf6b585519725177dc257a071 /qemu-config.c | |
parent | Merge commit '45a50b1668822c23afc2a89f724654e176518bc4' (diff) | |
parent | Port -net tap to QemuOpts (diff) | |
download | qemu-kvm-219ad804f358d0aec3555f6b060978601885bc7c.tar.gz qemu-kvm-219ad804f358d0aec3555f6b060978601885bc7c.tar.bz2 qemu-kvm-219ad804f358d0aec3555f6b060978601885bc7c.zip |
Merge commit '8a1c5235510da01a200693fe3cfd87acd2dc1fca'
Conflicts:
net.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'qemu-config.c')
-rw-r--r-- | qemu-config.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/qemu-config.c b/qemu-config.c index cfb1d2982..a8ce6e716 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -156,6 +156,18 @@ QemuOptsList qemu_device_opts = { }, }; +QemuOptsList qemu_net_opts = { + .name = "net", + .head = QTAILQ_HEAD_INITIALIZER(qemu_net_opts.head), + .desc = { + /* + * no elements => accept any params + * validation will happen later + */ + { /* end of list */ } + }, +}; + QemuOptsList qemu_rtc_opts = { .name = "rtc", .head = QTAILQ_HEAD_INITIALIZER(qemu_rtc_opts.head), @@ -180,6 +192,8 @@ static QemuOptsList *lists[] = { &qemu_drive_opts, &qemu_chardev_opts, &qemu_device_opts, + &qemu_net_opts, + &qemu_rtc_opts, NULL, }; @@ -212,8 +226,6 @@ int qemu_set_option(const char *str) } if (qemu_opt_set(opts, arg, str+offset+1) == -1) { - qemu_error("failed to set \"%s\" for %s \"%s\"\n", - arg, lists[i]->name, id); return -1; } return 0; |