From patchwork Wed Feb 10 23:29:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 45074 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 03811B7CB8 for ; Thu, 11 Feb 2010 10:37:00 +1100 (EST) Received: from localhost ([127.0.0.1]:35849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfM5n-0002my-9R for incoming@patchwork.ozlabs.org; Wed, 10 Feb 2010 18:35:35 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfM0a-0008Kv-6f for qemu-devel@nongnu.org; Wed, 10 Feb 2010 18:30:12 -0500 Received: from [199.232.76.173] (port=46820 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfM0Z-0008KW-Ph for qemu-devel@nongnu.org; Wed, 10 Feb 2010 18:30:11 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfM0Z-0004Ol-0D for qemu-devel@nongnu.org; Wed, 10 Feb 2010 18:30:11 -0500 Received: from mail-fx0-f223.google.com ([209.85.220.223]:32872) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfM0Y-0004Oh-MH for qemu-devel@nongnu.org; Wed, 10 Feb 2010 18:30:10 -0500 Received: by fxm23 with SMTP id 23so607164fxm.2 for ; Wed, 10 Feb 2010 15:30:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=vPlH18589loW1FQXNDrwo8LUnaSNsDHanZyAUG7CLTQ=; b=xHJO9DoErzhAFt66WVMlQY4wfCTByecGX/1/DiDyaQl0NzTIu47TfZh27vtpS5E0LK yttX1vROQInMJ/z7vlT7tTFSiulicyjVWivdPWfMuK+bVLzB/rA46Y0iNE1myVwJtEcp i9z9YcQmw6BtXPa5tojRsYQWD1XQJLSARb2SM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=qHDyOlg3A2vSzGKG19usb1ru4pHgYmeMN+N7bdgJ1eaIKw0lx/ukZts1fyZSsVV0tn n8hXvFuFVvxwnVd2jX7MpC2k77CKqI5zWp17VneEvUWteut5fSrYRMok4GGLXlIEVCgF ILlOsV16+8x1vXc4FL6HGYnIU/EC6DUMRhsgw= Received: by 10.223.27.70 with SMTP id h6mr1195361fac.50.1265844609628; Wed, 10 Feb 2010 15:30:09 -0800 (PST) Received: from localhost.localdomain ([85.93.118.17]) by mx.google.com with ESMTPS id 19sm2852341fkr.18.2010.02.10.15.30.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Feb 2010 15:30:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 11 Feb 2010 00:29:55 +0100 Message-Id: <1265844597-29941-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1265844597-29941-1-git-send-email-pbonzini@redhat.com> References: <1265844597-29941-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 1/3] use lazy initialization for display_state 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 Ensure initialization of a dumb display, if needed, by making all accesses go through get_displaystate. Signed-off-by: Paolo Bonzini --- vl.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/vl.c b/vl.c index 5ddf1fe..94aeb5e 100644 --- a/vl.c +++ b/vl.c @@ -2568,6 +2568,16 @@ struct DisplayAllocator default_allocator = { defaultallocator_free_displaysurface }; +/* dumb display */ + +static void dumb_display_init(void) +{ + DisplayState *ds = qemu_mallocz(sizeof(DisplayState)); + ds->allocator = &default_allocator; + ds->surface = qemu_create_displaysurface(ds, 640, 480); + register_displaystate(ds); +} + void register_displaystate(DisplayState *ds) { DisplayState **s; @@ -2580,6 +2590,9 @@ void register_displaystate(DisplayState *ds) DisplayState *get_displaystate(void) { + if (!display_state) { + dumb_display_init(); + } return display_state; } @@ -2589,16 +2602,6 @@ DisplayAllocator *register_displayallocator(DisplayState *ds, DisplayAllocator * return ds->allocator; } -/* dumb display */ - -static void dumb_display_init(void) -{ - DisplayState *ds = qemu_mallocz(sizeof(DisplayState)); - ds->allocator = &default_allocator; - ds->surface = qemu_create_displaysurface(ds, 640, 480); - register_displaystate(ds); -} - /***********************************************************/ /* I/O handling */ @@ -5871,10 +5874,8 @@ int main(int argc, char **argv, char **envp) if (qemu_opts_foreach(&qemu_device_opts, device_init_func, NULL, 1) != 0) exit(1); - if (!display_state) - dumb_display_init(); /* just use the first displaystate for the moment */ - ds = display_state; + ds = get_displaystate(); if (display_type == DT_DEFAULT) { #if defined(CONFIG_SDL) || defined(CONFIG_COCOA) @@ -5932,7 +5933,7 @@ int main(int argc, char **argv, char **envp) qemu_mod_timer(nographic_timer, qemu_get_clock(rt_clock)); } - text_consoles_set_display(display_state); + text_consoles_set_display(ds); if (qemu_opts_foreach(&qemu_mon_opts, mon_init_func, NULL, 1) != 0) exit(1);