From patchwork Tue Nov 17 09:38:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 38605 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 378D1B70CF for ; Tue, 17 Nov 2009 20:55:40 +1100 (EST) Received: from localhost ([127.0.0.1]:33526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAKme-0007cA-Ug for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2009 04:55:36 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAKWE-00028q-Iy for qemu-devel@nongnu.org; Tue, 17 Nov 2009 04:38:38 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAKW9-000263-Ak for qemu-devel@nongnu.org; Tue, 17 Nov 2009 04:38:37 -0500 Received: from [199.232.76.173] (port=51757 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAKW8-00025z-WB for qemu-devel@nongnu.org; Tue, 17 Nov 2009 04:38:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5976) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAKW8-0007Cr-2T for qemu-devel@nongnu.org; Tue, 17 Nov 2009 04:38:32 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAH9cUSA019929 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 04:38:31 -0500 Received: from zweiblum.home.kraxel.org (vpn1-7-195.ams2.redhat.com [10.36.7.195]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAH9cSs2021614; Tue, 17 Nov 2009 04:38:29 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id B181270062; Tue, 17 Nov 2009 10:38:20 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 17 Nov 2009 10:38:16 +0100 Message-Id: <1258450699-24445-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1258450699-24445-1-git-send-email-kraxel@redhat.com> References: <1258450699-24445-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 6/9] default devices: vga 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 Switch over vga to the new default device system. Disable default vga for both '-vga' and '-device VGA|Cirrus VGA|QEMUware SVGA)' cases. '-device VGA' still doesn't work though due to a initialization order issue (vga must init before calling i440fx_init_memory_mappings). Signed-off-by: Gerd Hoffmann --- vl.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index cd10b46..23afcc9 100644 --- a/vl.c +++ b/vl.c @@ -192,7 +192,7 @@ int autostart; static int rtc_utc = 1; static int rtc_date_offset = -1; /* -1 means no change */ QEMUClock *rtc_clock; -int vga_interface_type = VGA_CIRRUS; +int vga_interface_type = VGA_NONE; #ifdef TARGET_SPARC int graphic_width = 1024; int graphic_height = 768; @@ -274,6 +274,7 @@ static void *boot_set_opaque; static int default_serial = 1; static int default_parallel = 1; static int default_monitor = 1; +static int default_vga = 1; static struct { const char *driver; @@ -281,6 +282,9 @@ static struct { } default_list[] = { { .driver = "isa-serial", .flag = &default_serial }, { .driver = "isa-parallel", .flag = &default_parallel }, + { .driver = "VGA", .flag = &default_vga }, + { .driver = "Cirrus VGA", .flag = &default_vga }, + { .driver = "QEMUware SVGA", .flag = &default_vga }, }; static int default_driver_check(QemuOpts *opts, void *opaque) @@ -4326,6 +4330,7 @@ static void select_vgahw (const char *p) { const char *opts; + default_vga = 0; vga_interface_type = VGA_NONE; if (strstart(p, "std", &opts)) { vga_interface_type = VGA_STD; @@ -5505,6 +5510,8 @@ int main(int argc, char **argv, char **envp) if (default_monitor) add_device_config(DEV_MONITOR, "vc:80Cx24C"); } + if (default_vga) + vga_interface_type = VGA_CIRRUS; #ifndef _WIN32 if (daemonize) {