motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-15 22:21:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: convert check-qom-proplist to keyval

Browse source 
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:
Paolo Bonzini 2021-03-12 12:35:45 -05:00 • committed by Kevin Wolf
parent 155b5f8b8d
commit 53c9956d8b
1 changed files with 55 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

77
tests/unit/check-qom-proplist.c
View file

@ -21,6 +21,9 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.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 "qom/object.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/option.h" #include "qemu/option.h"
@ -398,44 +401,74 @@ static void test_dummy_createlist(void)
object_unparent(OBJECT(dobj)); 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) static void test_dummy_createcmdl(void)
{ {
QemuOpts *opts; QDict *qdict;
DummyObject *dobj; DummyObject *dobj;
Error *err = NULL; Error *err = NULL;
const char *params = TYPE_DUMMY \ bool created, help;
",id=dev0," \ const char *params = "bv=yes,sv=Hiss hiss hiss,av=platypus";
"bv=yes,sv=Hiss hiss hiss,av=platypus";
/* Needed for user_creatable_del. */
qemu_add_opts(&qemu_object_opts); 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(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(dobj);
g_assert_cmpstr(dobj->sv, ==, "Hiss hiss hiss"); g_assert_cmpstr(dobj->sv, ==, "Hiss hiss hiss");
g_assert(dobj->bv == true); g_assert(dobj->bv == true);
g_assert(dobj->av == DUMMY_PLATYPUS); 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); 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);
/* dobj = DUMMY_OBJECT(object_resolve_path_component(object_get_objects_root(),
* cmdline-parsing via qemu_opts_parse() results in a QemuOpts entry "dev0"));
* corresponding to the Object's ID to be added to the QemuOptsList g_assert(dobj);
* for objects. To avoid having this entry conflict with future g_assert_cmpstr(dobj->sv, ==, "Hiss hiss hiss");
* Objects using the same ID (which can happen in cases where g_assert(dobj->bv == true);
* qemu_opts_parse() is used to parse the object params, such as g_assert(dobj->av == DUMMY_PLATYPUS);
* with hmp_object_add() at the time of this comment), we need to g_assert(object_resolve_path_component(object_get_objects_root(), "dev0")
* check for this in user_creatable_del() and remove the QemuOpts if == OBJECT(dobj));
* it is present.
* object_unparent(OBJECT(dobj));
* The below check ensures this works as expected.
*/
g_assert_null(qemu_opts_find(&qemu_object_opts, "dev0"));
} }
static void test_dummy_badenum(void) static void test_dummy_badenum(void)