[Qemu-devel] [PATCH 1/2] qemu-accel: unbreak non-default accelerators

[Dmitry Baryshkov <dmitry.baryshkov@siemens.com>]

Make noaccel accelerator "registered" early so that
kqemu has a change to be enabled (it's registered
via __constructor__ feature, so called before main()).

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@siemens.com>
Cc: Glauber Costa <gcosta@redhat.com>
---
 vl.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/vl.c b/vl.c
index 16c1e15..bf9d83c 100644
--- a/vl.c
+++ b/vl.c
@@ -243,7 +243,6 @@ static CPUState *next_cpu;
 static int event_pending = 1;
 
 QEMUAccel *current_accel;
-QEMUCont *head = NULL;
 char qemu_app_name[20] = "QEMU";
 
 void decorate_app_name(void)
@@ -290,6 +289,11 @@ QEMUAccel noaccel = {
     .break_loop = accel_nop,
 };
 
+QEMUCont *head = &(QEMUCont){
+	.acc = &noaccel,
+	.active = 0,
+};
+
 #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
 
 /***********************************************************/
@@ -7766,9 +7770,6 @@ int main(int argc, char **argv)
     }
 #endif
 
-    /* Basic handler for the noaccel case */
-    register_qemu_accel(&noaccel);
-
     register_machines();
     machine = first_machine;
     cpu_model = NULL;
-- 
1.5.6.5