From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNSqy-0007cv-9V for qemu-devel@nongnu.org; Fri, 29 Aug 2014 16:33:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNSqs-0002lX-5N for qemu-devel@nongnu.org; Fri, 29 Aug 2014 16:33:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9475) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNSqr-0002lN-T3 for qemu-devel@nongnu.org; Fri, 29 Aug 2014 16:32:54 -0400 From: Eduardo Habkost Date: Fri, 29 Aug 2014 17:31:50 -0300 Message-Id: <1409344310-5441-18-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 17/17] kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct 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?= Now that we create an accel object before calling machine_init, we can simply use the accel object to save all KVMState data, instead of allocationg KVMState manually. Signed-off-by: Eduardo Habkost --- kvm-all.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 9815eaf..8a25f79 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -75,8 +75,10 @@ typedef struct KVMSlot typedef struct kvm_dirty_log KVMDirtyLog; -struct KVMState +typedef struct KVMState { + AccelState parent_obj; + KVMSlot *slots; int nr_slots; int fd; @@ -109,10 +111,13 @@ struct KVMState QTAILQ_HEAD(msi_hashtab, KVMMSIRoute) msi_hashtab[KVM_MSI_HASHTAB_SIZE]; bool direct_msi; #endif -}; +} KVMState; #define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm") +#define KVM_STATE(obj) \ + OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL) + KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; @@ -1392,7 +1397,7 @@ static int kvm_init(MachineState *ms) int i, type = 0; const char *kvm_type; - s = g_malloc0(sizeof(KVMState)); + s = KVM_STATE(ms->accelerator); /* * On systems where the kernel can support different base page @@ -1581,7 +1586,6 @@ err: close(s->fd); } g_free(s->slots); - g_free(s); return ret; } @@ -2230,6 +2234,7 @@ static const TypeInfo kvm_accel_type = { .name = TYPE_KVM_ACCEL, .parent = TYPE_ACCEL, .class_init = kvm_accel_class_init, + .instance_size = sizeof(KVMState), }; static void kvm_type_init(void) -- 1.9.3