From nobody Sat Apr 27 20:37:26 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 80.81.252.135 is neither permitted nor denied by domain of seabios.org) client-ip=80.81.252.135; envelope-from=seabios-bounces@seabios.org; helo=mail.coreboot.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 80.81.252.135 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org Return-Path: Received: from mail.coreboot.org (mail.coreboot.org [80.81.252.135]) by mx.zohomail.com with SMTPS id 1509695922659210.87701348782923; Fri, 3 Nov 2017 00:58:42 -0700 (PDT) Received: from [127.0.0.1] (helo=ra.coreboot.org) by mail.coreboot.org with esmtp (Exim 4.86_2) (envelope-from ) id 1eAWrt-0007zS-9M; Fri, 03 Nov 2017 08:58:21 +0100 Received: from mx1.redhat.com ([209.132.183.28]) by mail.coreboot.org with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_2) (envelope-from ) id 1eAWrj-0007y9-3A for seabios@seabios.org; Fri, 03 Nov 2017 08:58:20 +0100 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E51D356CE; Fri, 3 Nov 2017 07:58:08 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0149360BE0; Fri, 3 Nov 2017 07:58:03 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 398D316E04; Fri, 3 Nov 2017 08:58:02 +0100 (CET) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6E51D356CE Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: seabios@seabios.org Date: Fri, 3 Nov 2017 08:57:53 +0100 Message-Id: <20171103075753.23217-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 03 Nov 2017 07:58:08 +0000 (UTC) X-Spam-Score: -6.5 (------) Subject: [SeaBIOS] [PATCH] Ignore sgabios rom in case sercon is enabled. X-BeenThere: seabios@seabios.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SeaBIOS mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Daniel P. Berrange" , qemu-devel@nongnu.org, Gerd Hoffmann MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: seabios-bounces@seabios.org Sender: "SeaBIOS" X-Duff: Orig. Duff, Duff Lite, Duff Dry, Duff Dark, Raspberry Duff, Lady Duff, Red Duff, Tartar Control Duff X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We don't want them both be active. Signed-off-by: Gerd Hoffmann --- src/optionroms.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/optionroms.c b/src/optionroms.c index 092393a56c..a5ecd4cd11 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -193,6 +193,11 @@ run_file_roms(const char *prefix, int isvga, u64 *sour= ces) file =3D romfile_findprefix(prefix, file); if (!file) break; + if (strcmp(file->name, "vgaroms/sgabios.bin") =3D=3D 0 && + CONFIG_SERCON && romfile_loadint("etc/sercon-port", 0)) { + dprintf(1, "sercon: is enabled, not loading sgabios rom.\n"); + continue; + } struct rom_header *rom =3D deploy_romfile(file); if (rom) { setRomSource(sources, rom, (u32)file); --=20 2.9.3 _______________________________________________ SeaBIOS mailing list SeaBIOS@seabios.org https://mail.coreboot.org/mailman/listinfo/seabios