From patchwork Thu Nov 3 15:00:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 123449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2E3F3B6F6B for ; Fri, 4 Nov 2011 02:00:49 +1100 (EST) Received: from localhost ([::1]:42931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLymY-0003ue-Lw for incoming@patchwork.ozlabs.org; Thu, 03 Nov 2011 11:00:42 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLymO-0003te-KO for qemu-devel@nongnu.org; Thu, 03 Nov 2011 11:00:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RLymN-0007qS-DJ for qemu-devel@nongnu.org; Thu, 03 Nov 2011 11:00:32 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:65463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLymN-0007qO-AP for qemu-devel@nongnu.org; Thu, 03 Nov 2011 11:00:31 -0400 Received: by ywb3 with SMTP id 3so1633899ywb.4 for ; Thu, 03 Nov 2011 08:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer; bh=qNYCCns+452unqnUfa+fr5Tw3RQUoW/SuOUKotA+RJE=; b=ngDe+NsFme/DmAbKNqt6QdlnZYeRxHrDeau4BvMjqGijHxp1OCz7GQ/2hXI6k4nP4L PdaIcDlmQmgU2OoN53arxU2Jv5h1Fg1qFa0JUWSUGxLtlDd/vNRH3I1JqKNvGsR7Aoxl OygosvmbjEy/X4oIs1cDfc90rCwTrK+FqrUQA= Received: by 10.236.190.197 with SMTP id e45mr14148896yhn.101.1320332430502; Thu, 03 Nov 2011 08:00:30 -0700 (PDT) Received: from localhost.localdomain (93-34-223-65.ip51.fastwebnet.it. [93.34.223.65]) by mx.google.com with ESMTPS id r3sm7880841ank.19.2011.11.03.08.00.29 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Nov 2011 08:00:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 3 Nov 2011 16:00:22 +0100 Message-Id: <1320332422-2457-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.213.45 Subject: [Qemu-devel] [PATCH 1.0] disable automatic loading of sgabios when -nographic X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org sgabios hasn't gotten a lot of coverage since it was not shipped. For 1.0, let's disable the automatic loading of the option ROM in -nographic mode. We can put it back for 1.1. Signed-off-by: Paolo Bonzini --- Requested by Anthony on IRC. hw/pc.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index eb4c2d8..1024465 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1104,15 +1104,6 @@ void pc_vga_init(PCIBus *pci_bus) isa_vga_init(); } } - - /* - * sga does not suppress normal vga output. So a machine can have both a - * vga card and sga manually enabled. Output will be seen on both. - * For nographic case, sga is enabled at all times - */ - if (display_type == DT_NOGRAPHIC) { - isa_create_simple("sga"); - } } static void cpu_request_exit(void *opaque, int irq, int level)