mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-28 22:10:33 +00:00
15c2f669e3
As mentioned in previous patches, we want to call visit_end_struct() functions unconditionally, so that visitors can release resources tied up since the matching visit_start_struct() without also having to worry about error priority if more than one error occurs. Even though error_propagate() can be safely used to ignore a second error during cleanup caused by a first error, it is simpler if the cleanup cannot set an error. So, split out the error checking portion (basically, input visitors checking for unvisited keys) into a new function visit_check_struct(), which can be safely skipped if any earlier errors are encountered, and leave the cleanup portion (which never fails, but must be called unconditionally if visit_start_struct() succeeded) in visit_end_struct(). Generated code in qapi-visit.c has diffs resembling: |@@ -59,10 +59,12 @@ void visit_type_ACPIOSTInfo(Visitor *v, | goto out_obj; | } | visit_type_ACPIOSTInfo_members(v, obj, &err); |- error_propagate(errp, err); |- err = NULL; |+ if (err) { |+ goto out_obj; |+ } |+ visit_check_struct(v, &err); | out_obj: |- visit_end_struct(v, &err); |+ visit_end_struct(v); | out: and in qapi-event.c: @@ -47,7 +47,10 @@ void qapi_event_send_acpi_device_ost(ACP | goto out; | } | visit_type_q_obj_ACPI_DEVICE_OST_arg_members(v, ¶m, &err); |- visit_end_struct(v, err ? NULL : &err); |+ if (!err) { |+ visit_check_struct(v, &err); |+ } |+ visit_end_struct(v); | if (err) { | goto out; Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1461879932-9020-20-git-send-email-eblake@redhat.com> [Conflict with a doc fixup resolved] Signed-off-by: Markus Armbruster <armbru@redhat.com>
227 lines
5.0 KiB
C
227 lines
5.0 KiB
C
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qom/object_interfaces.h"
|
|
#include "qemu/module.h"
|
|
#include "qapi-visit.h"
|
|
#include "qapi/qmp-output-visitor.h"
|
|
#include "qapi/opts-visitor.h"
|
|
|
|
void user_creatable_complete(Object *obj, Error **errp)
|
|
{
|
|
|
|
UserCreatableClass *ucc;
|
|
UserCreatable *uc =
|
|
(UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE);
|
|
|
|
if (!uc) {
|
|
return;
|
|
}
|
|
|
|
ucc = USER_CREATABLE_GET_CLASS(uc);
|
|
if (ucc->complete) {
|
|
ucc->complete(uc, errp);
|
|
}
|
|
}
|
|
|
|
bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp)
|
|
{
|
|
|
|
UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc);
|
|
|
|
if (ucc->can_be_deleted) {
|
|
return ucc->can_be_deleted(uc, errp);
|
|
} else {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
Object *user_creatable_add(const QDict *qdict,
|
|
Visitor *v, Error **errp)
|
|
{
|
|
char *type = NULL;
|
|
char *id = NULL;
|
|
Object *obj = NULL;
|
|
Error *local_err = NULL;
|
|
QDict *pdict;
|
|
|
|
pdict = qdict_clone_shallow(qdict);
|
|
|
|
visit_start_struct(v, NULL, NULL, 0, &local_err);
|
|
if (local_err) {
|
|
goto out;
|
|
}
|
|
|
|
qdict_del(pdict, "qom-type");
|
|
visit_type_str(v, "qom-type", &type, &local_err);
|
|
if (local_err) {
|
|
goto out_visit;
|
|
}
|
|
|
|
qdict_del(pdict, "id");
|
|
visit_type_str(v, "id", &id, &local_err);
|
|
if (local_err) {
|
|
goto out_visit;
|
|
}
|
|
visit_check_struct(v, &local_err);
|
|
if (local_err) {
|
|
goto out_visit;
|
|
}
|
|
|
|
obj = user_creatable_add_type(type, id, pdict, v, &local_err);
|
|
|
|
out_visit:
|
|
visit_end_struct(v);
|
|
|
|
out:
|
|
QDECREF(pdict);
|
|
g_free(id);
|
|
g_free(type);
|
|
if (local_err) {
|
|
error_propagate(errp, local_err);
|
|
object_unref(obj);
|
|
return NULL;
|
|
}
|
|
return obj;
|
|
}
|
|
|
|
|
|
Object *user_creatable_add_type(const char *type, const char *id,
|
|
const QDict *qdict,
|
|
Visitor *v, Error **errp)
|
|
{
|
|
Object *obj;
|
|
ObjectClass *klass;
|
|
const QDictEntry *e;
|
|
Error *local_err = NULL;
|
|
|
|
klass = object_class_by_name(type);
|
|
if (!klass) {
|
|
error_setg(errp, "invalid object type: %s", type);
|
|
return NULL;
|
|
}
|
|
|
|
if (!object_class_dynamic_cast(klass, TYPE_USER_CREATABLE)) {
|
|
error_setg(errp, "object type '%s' isn't supported by object-add",
|
|
type);
|
|
return NULL;
|
|
}
|
|
|
|
if (object_class_is_abstract(klass)) {
|
|
error_setg(errp, "object type '%s' is abstract", type);
|
|
return NULL;
|
|
}
|
|
|
|
assert(qdict);
|
|
obj = object_new(type);
|
|
visit_start_struct(v, NULL, NULL, 0, &local_err);
|
|
if (local_err) {
|
|
goto out;
|
|
}
|
|
for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
|
|
object_property_set(obj, v, e->key, &local_err);
|
|
if (local_err) {
|
|
break;
|
|
}
|
|
}
|
|
if (!local_err) {
|
|
visit_check_struct(v, &local_err);
|
|
}
|
|
visit_end_struct(v);
|
|
if (local_err) {
|
|
goto out;
|
|
}
|
|
|
|
object_property_add_child(object_get_objects_root(),
|
|
id, obj, &local_err);
|
|
if (local_err) {
|
|
goto out;
|
|
}
|
|
|
|
user_creatable_complete(obj, &local_err);
|
|
if (local_err) {
|
|
object_property_del(object_get_objects_root(),
|
|
id, &error_abort);
|
|
goto out;
|
|
}
|
|
out:
|
|
if (local_err) {
|
|
error_propagate(errp, local_err);
|
|
object_unref(obj);
|
|
return NULL;
|
|
}
|
|
return obj;
|
|
}
|
|
|
|
|
|
Object *user_creatable_add_opts(QemuOpts *opts, Error **errp)
|
|
{
|
|
OptsVisitor *ov;
|
|
QDict *pdict;
|
|
Object *obj = NULL;
|
|
|
|
ov = opts_visitor_new(opts);
|
|
pdict = qemu_opts_to_qdict(opts, NULL);
|
|
|
|
obj = user_creatable_add(pdict, opts_get_visitor(ov), errp);
|
|
opts_visitor_cleanup(ov);
|
|
QDECREF(pdict);
|
|
return obj;
|
|
}
|
|
|
|
|
|
int user_creatable_add_opts_foreach(void *opaque, QemuOpts *opts, Error **errp)
|
|
{
|
|
bool (*type_predicate)(const char *) = opaque;
|
|
Object *obj = NULL;
|
|
Error *err = NULL;
|
|
const char *type;
|
|
|
|
type = qemu_opt_get(opts, "qom-type");
|
|
if (type && type_predicate &&
|
|
!type_predicate(type)) {
|
|
return 0;
|
|
}
|
|
|
|
obj = user_creatable_add_opts(opts, &err);
|
|
if (!obj) {
|
|
error_report_err(err);
|
|
return -1;
|
|
}
|
|
object_unref(obj);
|
|
return 0;
|
|
}
|
|
|
|
|
|
void user_creatable_del(const char *id, Error **errp)
|
|
{
|
|
Object *container;
|
|
Object *obj;
|
|
|
|
container = object_get_objects_root();
|
|
obj = object_resolve_path_component(container, id);
|
|
if (!obj) {
|
|
error_setg(errp, "object '%s' not found", id);
|
|
return;
|
|
}
|
|
|
|
if (!user_creatable_can_be_deleted(USER_CREATABLE(obj), errp)) {
|
|
error_setg(errp, "object '%s' is in use, can not be deleted", id);
|
|
return;
|
|
}
|
|
object_unparent(obj);
|
|
}
|
|
|
|
static void register_types(void)
|
|
{
|
|
static const TypeInfo uc_interface_info = {
|
|
.name = TYPE_USER_CREATABLE,
|
|
.parent = TYPE_INTERFACE,
|
|
.class_size = sizeof(UserCreatableClass),
|
|
};
|
|
|
|
type_register_static(&uc_interface_info);
|
|
}
|
|
|
|
type_init(register_types)
|