From patchwork Wed Sep 28 09:07:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9353385 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CC5156077B for ; Wed, 28 Sep 2016 09:08:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCE42293A7 for ; Wed, 28 Sep 2016 09:08:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B15342945B; Wed, 28 Sep 2016 09:08:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6987B293A7 for ; Wed, 28 Sep 2016 09:08:08 +0000 (UTC) Received: from localhost ([::1]:57024 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpAqV-0001pN-9d for patchwork-qemu-devel@patchwork.kernel.org; Wed, 28 Sep 2016 05:08:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpAq1-0001om-4B for qemu-devel@nongnu.org; Wed, 28 Sep 2016 05:07:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpApz-0001nZ-Lm for qemu-devel@nongnu.org; Wed, 28 Sep 2016 05:07:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57334) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpApz-0001nQ-FR for qemu-devel@nongnu.org; Wed, 28 Sep 2016 05:07:35 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B551C04D298; Wed, 28 Sep 2016 09:07:35 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-31.ams2.redhat.com [10.36.116.31]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8S97XA9027060; Wed, 28 Sep 2016 05:07:34 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 0F26C80C57; Wed, 28 Sep 2016 11:07:31 +0200 (CEST) From: Gerd Hoffmann To: seabios@seabios.org Date: Wed, 28 Sep 2016 11:07:20 +0200 Message-Id: <1475053640-30483-8-git-send-email-kraxel@redhat.com> In-Reply-To: <1475053640-30483-1-git-send-email-kraxel@redhat.com> References: <1475053640-30483-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 28 Sep 2016 09:07:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 7/7] [hack] ignore sgabios, enable sercon instead X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Temporary, for testing convinience. --- src/optionroms.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/optionroms.c b/src/optionroms.c index f08fcb1..bb0efff 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -23,7 +23,7 @@ #include "tcgbios.h" // tpm_* static int EnforceChecksum, S3ResumeVga, RunPCIroms; - +static int sgabios; /**************************************************************** * Helper functions @@ -193,6 +193,12 @@ run_file_roms(const char *prefix, int isvga, u64 *sources) file = romfile_findprefix(prefix, file); if (!file) break; + if (strcmp(file->name, "vgaroms/sgabios.bin") == 0) { + dprintf(1, "sgabios.bin found -> ignoring, enabling sercon instead.\n"); + dprintf(1, "hint: use '-machine graphics=no' instead of '-device sga'.\n"); + sgabios++; + continue; + } struct rom_header *rom = deploy_romfile(file); if (rom) { setRomSource(sources, rom, (u32)file); @@ -434,7 +440,7 @@ vgarom_setup(void) if (rom_get_last() == BUILD_ROM_START) { // No VGA rom found - if (romfile_loadint("etc/sercon-enable", 0)) { + if (romfile_loadint("etc/sercon-enable", 0) || sgabios) { sercon_enable(); enable_vga_console(); } @@ -442,7 +448,7 @@ vgarom_setup(void) } VgaROM = (void*)BUILD_ROM_START; - if (romfile_loadint("etc/sercon-enable", 0)) + if (romfile_loadint("etc/sercon-enable", 0) || sgabios) sercon_enable(); enable_vga_console(); }