mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
tests: convert check-qom-proplist to keyval
The command-line creation test is using QemuOpts. Switch it to keyval, since the emulator has some special needs and thus the last user of user_creatable_add_opts will go away with the next patch. Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20210312173547.1283477-2-pbonzini@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
155b5f8b8d
commit
53c9956d8b
|
@ -21,6 +21,9 @@
|
|||
#include "qemu/osdep.h"
|
||||
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qobject-input-visitor.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qobject.h"
|
||||
#include "qom/object.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/option.h"
|
||||
|
@ -398,44 +401,74 @@ static void test_dummy_createlist(void)
|
|||
object_unparent(OBJECT(dobj));
|
||||
}
|
||||
|
||||
static bool test_create_obj(QDict *qdict, Error **errp)
|
||||
{
|
||||
Visitor *v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
|
||||
Object *obj = user_creatable_add_type(TYPE_DUMMY, "dev0", qdict, v, errp);
|
||||
|
||||
visit_free(v);
|
||||
object_unref(obj);
|
||||
return !!obj;
|
||||
}
|
||||
|
||||
static void test_dummy_createcmdl(void)
|
||||
{
|
||||
QemuOpts *opts;
|
||||
QDict *qdict;
|
||||
DummyObject *dobj;
|
||||
Error *err = NULL;
|
||||
const char *params = TYPE_DUMMY \
|
||||
",id=dev0," \
|
||||
"bv=yes,sv=Hiss hiss hiss,av=platypus";
|
||||
bool created, help;
|
||||
const char *params = "bv=yes,sv=Hiss hiss hiss,av=platypus";
|
||||
|
||||
/* Needed for user_creatable_del. */
|
||||
qemu_add_opts(&qemu_object_opts);
|
||||
opts = qemu_opts_parse(&qemu_object_opts, params, true, &err);
|
||||
g_assert(err == NULL);
|
||||
g_assert(opts);
|
||||
|
||||
dobj = DUMMY_OBJECT(user_creatable_add_opts(opts, &err));
|
||||
qdict = keyval_parse(params, "qom-type", &help, &err);
|
||||
g_assert(err == NULL);
|
||||
g_assert(qdict);
|
||||
g_assert(!help);
|
||||
|
||||
created = test_create_obj(qdict, &err);
|
||||
g_assert(created);
|
||||
g_assert(err == NULL);
|
||||
qobject_unref(qdict);
|
||||
|
||||
dobj = DUMMY_OBJECT(object_resolve_path_component(object_get_objects_root(),
|
||||
"dev0"));
|
||||
g_assert(dobj);
|
||||
g_assert_cmpstr(dobj->sv, ==, "Hiss hiss hiss");
|
||||
g_assert(dobj->bv == true);
|
||||
g_assert(dobj->av == DUMMY_PLATYPUS);
|
||||
|
||||
qdict = keyval_parse(params, "qom-type", &help, &err);
|
||||
created = test_create_obj(qdict, &err);
|
||||
g_assert(!created);
|
||||
g_assert(err);
|
||||
g_assert(object_resolve_path_component(object_get_objects_root(), "dev0")
|
||||
== OBJECT(dobj));
|
||||
qobject_unref(qdict);
|
||||
error_free(err);
|
||||
err = NULL;
|
||||
|
||||
qdict = keyval_parse(params, "qom-type", &help, &err);
|
||||
user_creatable_del("dev0", &error_abort);
|
||||
g_assert(object_resolve_path_component(object_get_objects_root(), "dev0")
|
||||
== NULL);
|
||||
|
||||
object_unref(OBJECT(dobj));
|
||||
created = test_create_obj(qdict, &err);
|
||||
g_assert(created);
|
||||
g_assert(err == NULL);
|
||||
qobject_unref(qdict);
|
||||
|
||||
/*
|
||||
* cmdline-parsing via qemu_opts_parse() results in a QemuOpts entry
|
||||
* corresponding to the Object's ID to be added to the QemuOptsList
|
||||
* for objects. To avoid having this entry conflict with future
|
||||
* Objects using the same ID (which can happen in cases where
|
||||
* qemu_opts_parse() is used to parse the object params, such as
|
||||
* with hmp_object_add() at the time of this comment), we need to
|
||||
* check for this in user_creatable_del() and remove the QemuOpts if
|
||||
* it is present.
|
||||
*
|
||||
* The below check ensures this works as expected.
|
||||
*/
|
||||
g_assert_null(qemu_opts_find(&qemu_object_opts, "dev0"));
|
||||
dobj = DUMMY_OBJECT(object_resolve_path_component(object_get_objects_root(),
|
||||
"dev0"));
|
||||
g_assert(dobj);
|
||||
g_assert_cmpstr(dobj->sv, ==, "Hiss hiss hiss");
|
||||
g_assert(dobj->bv == true);
|
||||
g_assert(dobj->av == DUMMY_PLATYPUS);
|
||||
g_assert(object_resolve_path_component(object_get_objects_root(), "dev0")
|
||||
== OBJECT(dobj));
|
||||
|
||||
object_unparent(OBJECT(dobj));
|
||||
}
|
||||
|
||||
static void test_dummy_badenum(void)
|
||||
|
|
Loading…
Reference in a new issue