Received: from eggs.gnu.org ([2001:4830:134:3::10]:48519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNSqv-0007Y1-Jq for qemu-devel@nongnu.org; Fri, 29 Aug 2014 16:33:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNSqp-0002lC-Fn for qemu-devel@nongnu.org; Fri, 29 Aug 2014 16:32:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNSqp-0002l8-2m for qemu-devel@nongnu.org; Fri, 29 Aug 2014 16:32:51 -0400 From: Eduardo Habkost Date: Fri, 29 Aug 2014 17:31:49 -0300 Message-Id: <1409344310-5441-17-git-send-email-ehabkost@redhat.com> In-Reply-To: <1409344310-5441-1-git-send-email-ehabkost@redhat.com> References: <1409344310-5441-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 16/17] accel: Save AccelState on MachineState when initializing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Mueller , Marcel Apfelbaum , "Michael S. Tsirkin" , Alexander Graf , Christian Borntraeger , "Jason J. Herne" , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= This will allow machine initialization code to get the accelerator object if necessary. Signed-off-by: Eduardo Habkost --- hw/core/accel.c | 3 +++ include/hw/boards.h | 1 + include/qemu/typedefs.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/hw/core/accel.c b/hw/core/accel.c index 66ee1fa..2e1ea76 100644 --- a/hw/core/accel.c +++ b/hw/core/accel.c @@ -32,6 +32,7 @@ #include "sysemu/qtest.h" #include "hw/xen/xen.h" #include "qom/object.h" +#include "hw/boards.h" int tcg_tb_size; static bool tcg_allowed = true; @@ -64,9 +65,11 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms) const char *cname = object_class_get_name(oc); AccelState *accel = ACCEL(object_new(cname)); int ret; + ms->accelerator = accel; *(acc->allowed) = true; ret = acc->init_machine(ms); if (ret < 0) { + ms->accelerator = NULL; *(acc->allowed) = false; object_unref(OBJECT(accel)); } diff --git a/include/hw/boards.h b/include/hw/boards.h index 605a970..1cff2b4 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -132,6 +132,7 @@ struct MachineState { char *kernel_cmdline; char *initrd_filename; const char *cpu_model; + AccelState *accelerator; }; #endif diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 04df51b..446af93 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -30,6 +30,8 @@ typedef struct MemoryListener MemoryListener; typedef struct MemoryMappingList MemoryMappingList; +typedef struct AccelState AccelState; + typedef struct QEMUMachine QEMUMachine; typedef struct MachineClass MachineClass; typedef struct MachineState MachineState; -- 1.9.3