From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KdAcp-0001hr-Ej for qemu-devel@nongnu.org; Tue, 09 Sep 2008 17:19:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KdAcj-0001Zz-Na for qemu-devel@nongnu.org; Tue, 09 Sep 2008 17:19:49 -0400 Received: from [199.232.76.173] (port=59643 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KdAci-0001ZP-LB for qemu-devel@nongnu.org; Tue, 09 Sep 2008 17:19:44 -0400 Received: from goliath.siemens.de ([192.35.17.28]:17833) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KdAcg-00006t-Tc for qemu-devel@nongnu.org; Tue, 09 Sep 2008 17:19:43 -0400 Received: from mail3.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id m89LJdaR030117 for ; Tue, 9 Sep 2008 23:19:39 +0200 Received: from belfalas ([163.242.202.68]) by mail3.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id m89LJd3I030396 for ; Tue, 9 Sep 2008 23:19:39 +0200 Resent-Message-ID: <20080909212014.GB10659@belfalas> Resent-To: qemu-devel@nongnu.org From: Dmitry Baryshkov Date: Tue, 9 Sep 2008 20:37:37 +0400 Message-Id: <1220978258-30894-1-git-send-email-dmitry.baryshkov@siemens.com> Subject: [Qemu-devel] [PATCH 1/2] qemu-accel: unbreak non-default accelerators Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Glauber Costa , Dmitry Baryshkov 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 Cc: Glauber Costa --- 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