[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 16/17] accel: Create accel object when initializi
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v3 16/17] accel: Create accel object when initializing machine |
Date: |
Fri, 26 Sep 2014 17:45:31 -0300 |
Create an actual TYPE_ACCEL object when initializing a machine. This
will allow accelerator classes to implement some initialization on
instance_init, and to save state on the TYPE_ACCEL object.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v2 -> v3:
* Squashed "accel: Create accel object when initializing machine" and
"accel: Save AccelState on MachineState when initializing" in a single
patch
---
accel.c | 7 +++++++
include/hw/boards.h | 1 +
include/qemu/typedefs.h | 2 ++
3 files changed, 10 insertions(+)
diff --git a/accel.c b/accel.c
index 6087ab3..74e41da 100644
--- a/accel.c
+++ b/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;
@@ -60,11 +61,17 @@ static AccelClass *accel_find(const char *opt_name)
static int accel_init_machine(AccelClass *acc, MachineState *ms)
{
+ ObjectClass *oc = OBJECT_CLASS(acc);
+ 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));
}
return ret;
}
diff --git a/include/hw/boards.h b/include/hw/boards.h
index dfb6718..8f0eeaf 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -133,6 +133,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
- [Qemu-devel] [PATCH v3 06/17] accel: Use QOM classes for accel types, (continued)
- [Qemu-devel] [PATCH v3 06/17] accel: Use QOM classes for accel types, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 07/17] accel: Make AccelClass.available() optional, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 08/17] accel: Report unknown accelerator as "not found" instead of "does not exist", Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 09/17] accel: Move KVM accel registration to kvm-all.c, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 10/17] accel: Move Xen registration code to xen-common.c, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 11/17] accel: Move qtest accel registration to qtest.c, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 12/17] accel: Remove tcg_available() function, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 13/17] accel: Move accel init/allowed code to separate function, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 14/17] accel: Rename 'init' method to 'init_machine', Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 15/17] accel: Pass MachineState object to accel init functions, Eduardo Habkost, 2014/09/26
- [Qemu-devel] [PATCH v3 16/17] accel: Create accel object when initializing machine,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v3 17/17] kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct, Eduardo Habkost, 2014/09/26
- Re: [Qemu-devel] [PATCH v3 00/17] QOMify accelerator code, Paolo Bonzini, 2014/09/29