From patchwork Mon Apr 26 15:47:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 50972 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0D648B7D2F for ; Tue, 27 Apr 2010 02:06:57 +1000 (EST) Received: from localhost ([127.0.0.1]:38341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6QmV-0004PK-CR for incoming@patchwork.ozlabs.org; Mon, 26 Apr 2010 12:03:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O6QYF-0000x7-AU for qemu-devel@nongnu.org; Mon, 26 Apr 2010 11:48:51 -0400 Received: from [140.186.70.92] (port=34800 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6QYE-0000wc-4J for qemu-devel@nongnu.org; Mon, 26 Apr 2010 11:48:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O6QYC-0007JI-89 for qemu-devel@nongnu.org; Mon, 26 Apr 2010 11:48:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22916) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O6QYB-0007Iy-SZ for qemu-devel@nongnu.org; Mon, 26 Apr 2010 11:48:48 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3QFmkBM032143 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Apr 2010 11:48:47 -0400 Received: from localhost (vpn-8-143.rdu.redhat.com [10.11.8.143]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3QFmivH021372; Mon, 26 Apr 2010 11:48:45 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Mon, 26 Apr 2010 12:47:31 -0300 Message-Id: <1272296853-30285-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1272296853-30285-1-git-send-email-lcapitulino@redhat.com> References: <1272296853-30285-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Jan Kiszka , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 7/9] monitor: Reorder intialization to drop initial mux focus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka So far a multiplexed monitor started disabled. Restore this property for the new way of configuring by moving the monitor initialization before all devices (the last one to attach to a char-mux will gain the focus). Once we have a real use case for that, we may also consider assigning the initial focus explicitly. Signed-off-by: Jan Kiszka Signed-off-by: Luiz Capitulino --- vl.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 20d24be..a485c58 100644 --- a/vl.c +++ b/vl.c @@ -3618,6 +3618,10 @@ int main(int argc, char **argv, char **envp) } } + if (qemu_opts_foreach(&qemu_mon_opts, mon_init_func, NULL, 1) != 0) { + exit(1); + } + if (foreach_device_config(DEV_SERIAL, serial_parse) < 0) exit(1); if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0) @@ -3730,9 +3734,6 @@ int main(int argc, char **argv, char **envp) text_consoles_set_display(ds); - if (qemu_opts_foreach(&qemu_mon_opts, mon_init_func, NULL, 1) != 0) - exit(1); - if (gdbstub_dev && gdbserver_start(gdbstub_dev) < 0) { fprintf(stderr, "qemu: could not open gdbserver on device '%s'\n", gdbstub_dev);