From patchwork Wed Jan 8 16:09:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 308371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BDF4D2C009E for ; Thu, 9 Jan 2014 03:17:20 +1100 (EST) Received: from localhost ([::1]:47630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0vok-0005Ba-JZ for incoming@patchwork.ozlabs.org; Wed, 08 Jan 2014 11:17:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0vla-0000ZK-GB for qemu-devel@nongnu.org; Wed, 08 Jan 2014 11:14:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0vlU-0003Ws-Fv for qemu-devel@nongnu.org; Wed, 08 Jan 2014 11:14:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0vlU-0003Wj-8P for qemu-devel@nongnu.org; Wed, 08 Jan 2014 11:13:56 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s08GDnlG007959 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Jan 2014 11:13:49 -0500 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s08GDbDZ006503; Wed, 8 Jan 2014 11:13:46 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 8 Jan 2014 17:09:39 +0100 Message-Id: <1389197382-25085-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1389197382-25085-1-git-send-email-imammedo@redhat.com> References: <1389197382-25085-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: stefanha@redhat.com, sw@weilnetz.de, mjt@tls.msk.ru, lcapitulino@redhat.com, blauwirbel@gmail.com, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH 2/5] add optional 2nd stage initialization to -object/object-add/object_add commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Provides an ability to do an optional second stage initialization of an object created with -object/object-add/object_add commands. Patch adds interface that provides realize() callback, which is called after the object properties were set upon completion of -object/object-add/object_add command, if the type implements OBJECT_REALIZE_INTERFACE. It allows to: * generalize second stage backend initialization instead of adding custom APIs to perform it * early error detection of backend initialization at -object/ object-add/object_add time rather than through a proxy DEVICE object that tries to use backend. Signed-off-by: Igor Mammedov --- Next patch will convert virtio_rng to a new interface as an example. The same interface will be useful for memory backend. --- include/qom/object_interfaces.h | 53 +++++++++++++++++++++++++++++++++++++++ qmp.c | 6 ++++ qom/Makefile.objs | 1 + qom/object_interfaces.c | 33 ++++++++++++++++++++++++ vl.c | 14 ++++++++++ 5 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 include/qom/object_interfaces.h create mode 100644 qom/object_interfaces.c diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h new file mode 100644 index 0000000..8a42d46 --- /dev/null +++ b/include/qom/object_interfaces.h @@ -0,0 +1,53 @@ +#ifndef OBJECT_INTERFACES_H +#define OBJECT_INTERFACES_H + +#include "qom/object.h" + +#define TYPE_OBJECT_REALIZE_INTERFACE "object-realize-interface" + +#define OBJECT_REALIZE_INTERFACE_CLASS(klass) \ + OBJECT_CLASS_CHECK(ObjectRealizeInterfaceClass, (klass), \ + TYPE_OBJECT_REALIZE_INTERFACE) +#define OBJECT_REALIZE_INTERFACE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(ObjectRealizeInterfaceClass, (obj), \ + TYPE_OBJECT_REALIZE_INTERFACE) +#define OBJECT_REALIZE_INTERFACE(obj) \ + INTERFACE_CHECK(ObjectRealizeInterface, (obj), \ + TYPE_OBJECT_REALIZE_INTERFACE) + + +typedef struct ObjectRealizeInterface { + /* */ + Object Parent; +} ObjectRealizeInterface; + +/** + * ObjectRealizeInterfaceClass: + * @parent_class: the base class + * @realize: callback to be called after @obj's properties are set. + * + * Interface is designed to work with -object/object-add/object_add + * commands and provides an optional ability to do the second stage + * initialization of the object after its properties were set. + * + * For objects created without using -object/object-add/object_add, + * @call_object_realize_interface should be called manually if object's + * type implements OBJECT_REALIZE_INTERFACE. + */ +typedef struct ObjectRealizeInterfaceClass { + /* */ + InterfaceClass parent_class; + + void (*realize)(ObjectRealizeInterface *obj, Error **errp); +} ObjectRealizeInterfaceClass; + +/** + * call_object_realize_interface: + * @obj: the object whose realize() method is called + * @errp: if an error occurs, a pointer to an area to store the error + * + * Wrapper to call realize() method if one of obj's types + * implements OBJECT_REALIZE_INTERFACE, otherwise the call does nothing. + */ +void call_object_realize_interface(Object *obj, Error **errp); +#endif diff --git a/qmp.c b/qmp.c index a67e0c4..3ed78cd 100644 --- a/qmp.c +++ b/qmp.c @@ -27,6 +27,7 @@ #include "qapi/qmp/qobject.h" #include "qapi/qmp-input-visitor.h" #include "hw/boards.h" +#include "qom/object_interfaces.h" NameInfo *qmp_query_name(Error **errp) { @@ -554,6 +555,11 @@ void object_add(const char *type, const char *id, const QDict *qdict, } } + call_object_realize_interface(obj, &local_err); + if (local_err) { + goto out; + } + object_property_add_child(container_get(object_get_root(), "/objects"), id, obj, &local_err); out: diff --git a/qom/Makefile.objs b/qom/Makefile.objs index 6a93ac7..985003b 100644 --- a/qom/Makefile.objs +++ b/qom/Makefile.objs @@ -1,2 +1,3 @@ common-obj-y = object.o container.o qom-qobject.o common-obj-y += cpu.o +common-obj-y += object_interfaces.o diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c new file mode 100644 index 0000000..d2aa722 --- /dev/null +++ b/qom/object_interfaces.c @@ -0,0 +1,33 @@ +#include "qom/object_interfaces.h" +#include "qemu/module.h" + +void call_object_realize_interface(Object *obj, Error **errp) +{ + ObjectRealizeInterface *ori; + ObjectRealizeInterfaceClass *oric; + + ori = (ObjectRealizeInterface *) + object_dynamic_cast(obj, TYPE_OBJECT_REALIZE_INTERFACE); + if (!ori) { + return; + } + + oric = OBJECT_REALIZE_INTERFACE_GET_CLASS(ori); + if (oric->realize) { + oric->realize(ori, errp); + } +} + + +static void register_types(void) +{ + static const TypeInfo realize_interface_info = { + .name = TYPE_OBJECT_REALIZE_INTERFACE, + .parent = TYPE_INTERFACE, + .class_size = sizeof(ObjectRealizeInterfaceClass), + }; + + type_register_static(&realize_interface_info); +} + +type_init(register_types) diff --git a/vl.c b/vl.c index 45f9177..1620393 100644 --- a/vl.c +++ b/vl.c @@ -170,6 +170,7 @@ int main(int argc, char **argv) #include "ui/qemu-spice.h" #include "qapi/string-input-visitor.h" +#include "qom/object_interfaces.h" //#define DEBUG_NET //#define DEBUG_SLIRP @@ -2798,6 +2799,7 @@ static int object_create(QemuOpts *opts, void *opaque) { const char *type = qemu_opt_get(opts, "qom-type"); const char *id = qemu_opts_id(opts); + Error *local_err = NULL; Object *obj; g_assert(type != NULL); @@ -2813,9 +2815,21 @@ static int object_create(QemuOpts *opts, void *opaque) return -1; } + call_object_realize_interface(obj, &local_err); + if (local_err) { + goto out; + } + object_property_add_child(container_get(object_get_root(), "/objects"), id, obj, NULL); + +out: object_unref(obj); + if (local_err) { + qerror_report_err(local_err); + error_free(local_err); + return -1; + } return 0; }