Merge remote-tracking branch 'remotes/berrange/tags/block-odirect-pull-request' into...

[qemu.git] / accel / accel.c

diff --git a/accel/accel.c b/accel/accel.c
index dd38a468afb9b300ebd6e0395a5f63b6db2c9cef..cb555e3b06c6189d8b330dd1b4ecf93d1ed2ce13 100644 (file)
--- a/accel/accel.c
+++ b/accel/accel.c
@@ -46,9 +46,9 @@ AccelClass *accel_find(const char *opt_name)
     return ac;
 }
 
-int accel_init_machine(AccelClass *acc, MachineState *ms)
+int accel_init_machine(AccelState *accel, MachineState *ms)
 {
-    AccelState *accel = ACCEL(object_new_with_class(OBJECT_CLASS(acc)));
+    AccelClass *acc = ACCEL_GET_CLASS(accel);
     int ret;
     ms->accelerator = accel;
     *(acc->allowed) = true;
@@ -63,6 +63,11 @@ int accel_init_machine(AccelClass *acc, MachineState *ms)
     return ret;
 }
 
+AccelState *current_accel(void)
+{
+    return current_machine->accelerator;
+}
+
 void accel_setup_post(MachineState *ms)
 {
     AccelState *accel = ms->accelerator;