diff options
| author | Eric Blake <eblake@redhat.com> | 2017-03-23 11:03:15 -0500 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-23 17:59:40 +0000 |
| commit | 08329701199449bde497570dcfdb9c86062baf20 (patch) | |
| tree | cdc35825cf64ed82f2eb1e2c1d1da47e84550d22 /qom | |
| parent | c50126aac1e80f3ab255fbceffff953f5f17e4df (diff) | |
| download | qemu-08329701199449bde497570dcfdb9c86062baf20.zip qemu-08329701199449bde497570dcfdb9c86062baf20.tar.gz qemu-08329701199449bde497570dcfdb9c86062baf20.tar.bz2 | |
qom: Fix regression with 'qom-type'
Commit 9a6d1ac assumed that 'qom-type' could be removed from QemuOpts
with no ill effects. However, this command line proves otherwise:
$ ./x86_64-softmmu/qemu-system-x86_64 -nodefaults -nographic -qmp stdio \
-object rng-random,filename=/dev/urandom,id=rng0 \
-device virtio-rng-pci,rng=rng0
qemu-system-x86_64: -object rng-random,filename=/dev/urandom,id=rng0: Parameter 'qom-type' is missing
Fix the regression by restoring qom-type in opts after its temporary
removal that was needed for the duration of user_creatable_add_opts().
Reported-by: Richard W. M. Jones <rjones@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Tested-by: Richard W.M. Jones <rjones@redhat.com>
Message-id: 20170323160315.19696-1-eblake@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom')
| -rw-r--r-- | qom/object_interfaces.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 9c271ad..d4253a8 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -122,6 +122,7 @@ Object *user_creatable_add_opts(QemuOpts *opts, Error **errp) } if (!id) { error_setg(errp, QERR_MISSING_PARAMETER, "id"); + qemu_opt_set(opts, "qom-type", type, &error_abort); g_free(type); return NULL; } @@ -134,6 +135,7 @@ Object *user_creatable_add_opts(QemuOpts *opts, Error **errp) visit_free(v); qemu_opts_set_id(opts, (char *) id); + qemu_opt_set(opts, "qom-type", type, &error_abort); g_free(type); QDECREF(pdict); return obj; |