On 04/12/2012 08:44 AM, Andreas Färber wrote:
Wrap setting of Object::realized property, error reporting and exit(1)
into a helper function. It is the equivalent of qdev_init_nofail().
I don't like this.
If for no reason other than, a much more specific justification is needed for
this. I absolutely don't want to repeat the error handling mistakes of qdev. I
would rather we refactor all of the users of qdev_init_nofail() to propagate errors.
Regards,
Anthony Liguori
Signed-off-by: Andreas Färber<afaer...@suse.de>
Cc: Anthony Liguori<anth...@codemonkey.ws>
Cc: Paolo Bonzini<pbonz...@redhat.com>
Cc: Peter Maydell<peter.mayd...@linaro.org>
---
Hi Paolo, please consider appending this patch to your push-push series.
It then provides equivalent second-stage init functionality for non-qdev
objects, as desired for ARMCPU and SH7750 SoC.
include/qemu/object.h | 10 ++++++++++
qom/object.c | 11 +++++++++++
2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/include/qemu/object.h b/include/qemu/object.h
index 360181d..524d3b0 100644
--- a/include/qemu/object.h
+++ b/include/qemu/object.h
@@ -504,6 +504,16 @@ void object_initialize_with_type(void *data, Type type);
void object_initialize(void *obj, const char *typename);
/**
+ * object_realize_nofail:
+ * @obj: The object to realize.
+ *
+ * This function will complete the initialization of an object based on
+ * properties set by setting the "realized" property to true.
+ * Like #qdev_init_nofail it will terminate the process in case of errors.
+ */
+void object_realize_nofail(Object *obj);
+
+/**
* object_finalize:
* @obj: The object to finalize.
*
diff --git a/qom/object.c b/qom/object.c
index f4f29ab..1ef0b9b 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -381,6 +381,17 @@ void object_initialize(void *data, const char *typename)
object_initialize_with_type(data, type);
}
+void object_realize_nofail(Object *obj)
+{
+ Error *err = NULL;
+
+ object_property_set_bool(obj, true, "realized",&err);
+ if (error_is_set(&err)) {
+ qerror_report_err(err);
+ exit(1);
+ }
+}
+
static void object_property_del_all(Object *obj)
{
while (!QTAILQ_EMPTY(&obj->properties)) {
