Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.1-pull-request...

[mirror_qemu.git] / accel / accel.c

diff --git a/accel/accel.c b/accel/accel.c
index 8deb475b5dd4119428b4ddb830b175d61af248ce..5fa31717b48206633ce7db4a62400f2436442ebd 100644 (file)
--- a/accel/accel.c
+++ b/accel/accel.c
@@ -65,8 +65,9 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms)
         ms->accelerator = NULL;
         *(acc->allowed) = false;
         object_unref(OBJECT(accel));
+    } else {
+        object_set_accelerator_compat_props(acc->compat_props);
     }
-    object_set_accelerator_compat_props(acc->compat_props);
     return ret;
 }
 
@@ -106,11 +107,6 @@ void configure_accelerator(MachineState *ms, const char *progname)
         if (!acc) {
             continue;
         }
-        if (acc->available && !acc->available()) {
-            printf("%s not supported for this target\n",
-                   acc->name);
-            continue;
-        }
         ret = accel_init_machine(acc, ms);
         if (ret < 0) {
             init_failed = true;