diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-09-26 17:45:32 -0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-10-09 15:36:15 +0200 |
| commit | fc02086b5ab8de50ce8234cf8f42b254de9e5d91 (patch) | |
| tree | b9fbdade621b2cea38a3aeaa492f461e4a2efe26 | |
| parent | ac2da55e01b1a84e6bba32768211201dec230232 (diff) | |
| download | focaccia-qemu-fc02086b5ab8de50ce8234cf8f42b254de9e5d91.tar.gz focaccia-qemu-fc02086b5ab8de50ce8234cf8f42b254de9e5d91.zip | |
kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct
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. Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | kvm-all.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/kvm-all.c b/kvm-all.c index 0a9de929e0..e98a7c74a7 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -71,8 +71,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; @@ -105,10 +107,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; @@ -1401,7 +1406,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 @@ -1590,7 +1595,6 @@ err: close(s->fd); } g_free(s->slots); - g_free(s); return ret; } @@ -2242,6 +2246,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) |