openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vl: redo -object parsing 

Follow the lines of the HMP implementation, using OptsVisitor
to parse the options.  This gives access to OptsVisitor's
rich parsing of integer lists.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-06-10 19:15:15 +08:00 committed by Michael S. Tsirkin
parent 7f56e740a6
commit c4090f8ef6
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
vl.c
View File

@ -116,7 +116,7 @@ int main(int argc, char **argv)
#include "ui/qemu-spice.h" #include "ui/qemu-spice.h"
#include "qapi/string-input-visitor.h" #include "qapi/string-input-visitor.h"
#include "qom/object_interfaces.h" #include "qapi/opts-visitor.h"
#define DEFAULT_RAM_SIZE 128 #define DEFAULT_RAM_SIZE 128
@ -2822,44 +2822,51 @@ static int object_set_property(const char *name, const char *value, void *opaque
static int object_create(QemuOpts *opts, void *opaque) static int object_create(QemuOpts *opts, void *opaque)
{ {
const char *type = qemu_opt_get(opts, "qom-type"); Error *err = NULL;
const char *id = qemu_opts_id(opts); char *type = NULL;
Error *local_err = NULL; char *id = NULL;
Object *obj; void *dummy = NULL;
OptsVisitor *ov;
QDict *pdict;
g_assert(type != NULL); ov = opts_visitor_new(opts);
pdict = qemu_opts_to_qdict(opts, NULL);
if (id == NULL) { visit_start_struct(opts_get_visitor(ov), &dummy, NULL, NULL, 0, &err);
qerror_report(QERR_MISSING_PARAMETER, "id"); if (err) {
return -1;
}
obj = object_new(type);
if (qemu_opt_foreach(opts, object_set_property, obj, 1) < 0) {
object_unref(obj);
return -1;
}
if (!object_dynamic_cast(obj, TYPE_USER_CREATABLE)) {
error_setg(&local_err, "object '%s' isn't supported by -object",
id);
goto out; goto out;
} }
object_property_add_child(container_get(object_get_root(), "/objects"), qdict_del(pdict, "qom-type");
id, obj, &local_err); visit_type_str(opts_get_visitor(ov), &type, "qom-type", &err);
if (err) {
user_creatable_complete(obj, &local_err);
if (local_err) {
object_property_del(container_get(object_get_root(), "/objects"),
id, &error_abort);
goto out; goto out;
} }
qdict_del(pdict, "id");
visit_type_str(opts_get_visitor(ov), &id, "id", &err);
if (err) {
goto out;
}
object_add(type, id, pdict, opts_get_visitor(ov), &err);
if (err) {
goto out;
}
visit_end_struct(opts_get_visitor(ov), &err);
if (err) {
qmp_object_del(id, NULL);
}
out: out:
object_unref(obj); opts_visitor_cleanup(ov);
if (local_err) {
qerror_report_err(local_err); QDECREF(pdict);
error_free(local_err); g_free(id);
g_free(type);
g_free(dummy);
if (err) {
qerror_report_err(err);
return -1; return -1;
} }
return 0; return 0;