From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjKC5-0005jh-Nc for qemu-devel@nongnu.org; Wed, 20 Nov 2013 21:40:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjKBz-0003yd-Mc for qemu-devel@nongnu.org; Wed, 20 Nov 2013 21:40:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjKBz-0003yS-CI for qemu-devel@nongnu.org; Wed, 20 Nov 2013 21:40:31 -0500 From: Igor Mammedov Date: Thu, 21 Nov 2013 03:38:27 +0100 Message-Id: <1385001528-12003-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1385001528-12003-1-git-send-email-imammedo@redhat.com> References: <1385001528-12003-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 06/27] get reference to /backend container via qemu_get_backend() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, stefanha@redhat.com, mst@redhat.com, chegu_vinod@hp.com, stefanb@linux.vnet.ibm.com, mjt@tls.msk.ru, mdroth@linux.vnet.ibm.com, armbru@redhat.com, vasilis.liaskovitis@profitbricks.com, quintela@redhat.com, kraxel@redhat.com, aliguori@amazon.com, hutao@cn.fujitsu.com, pbonzini@redhat.com, marcel.a@redhat.com, lcapitulino@redhat.com, afaerber@suse.de ... API, so it could be reused later using qemu_get_backend() without duplicating "/backend" everywhere. Signed-off-by: Igor Mammedov --- include/sysemu/sysemu.h | 3 +++ ui/console.c | 3 ++- vl.c | 11 +++++++++++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index cd5791e..2a71293 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -9,6 +9,7 @@ #include "qapi-types.h" #include "qemu/notify.h" #include "qemu/main-loop.h" +#include "qom/object.h" /* vl.c */ @@ -87,6 +88,8 @@ void qemu_savevm_state_cancel(void); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); int qemu_loadvm_state(QEMUFile *f); +Object *qemu_get_backend(void); + /* SLIRP */ void do_info_slirp(Monitor *mon); diff --git a/ui/console.c b/ui/console.c index aad4fc9..868d5a1 100644 --- a/ui/console.c +++ b/ui/console.c @@ -27,6 +27,7 @@ #include "qemu/timer.h" #include "qmp-commands.h" #include "sysemu/char.h" +#include "sysemu/sysemu.h" //#define DEBUG_CONSOLE #define DEFAULT_BACKSCROLL 512 @@ -1598,7 +1599,7 @@ DisplayState *init_displaystate(void) * all QemuConsoles are created and the order / numbering * doesn't change any more */ name = g_strdup_printf("console[%d]", i); - object_property_add_child(container_get(object_get_root(), "/backend"), + object_property_add_child(qemu_get_backend(), name, OBJECT(consoles[i]), &local_err); g_free(name); } diff --git a/vl.c b/vl.c index 5974f0f..1de3d57 100644 --- a/vl.c +++ b/vl.c @@ -2846,6 +2846,17 @@ static void qemu_init_default_mem_opts(uint64_t size) qemu_opt_set_number(opts, "slots", 0); } +Object *qemu_get_backend(void) +{ + static Object *obj; + + if (obj == NULL) { + obj = container_get(object_get_root(), "/backend"); + } + + return obj; +} + int main(int argc, char **argv, char **envp) { int i; -- 1.7.1