From patchwork Thu Jan 13 06:34:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David S. Ahern" X-Patchwork-Id: 78662 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 8F71BB70E3 for ; Thu, 13 Jan 2011 17:37:02 +1100 (EST) Received: from localhost ([127.0.0.1]:33175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdGnr-0001VX-0O for incoming@patchwork.ozlabs.org; Thu, 13 Jan 2011 01:36:59 -0500 Received: from [140.186.70.92] (port=43119 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdGlh-0001VE-VJ for qemu-devel@nongnu.org; Thu, 13 Jan 2011 01:34:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PdGlg-0000P8-9h for qemu-devel@nongnu.org; Thu, 13 Jan 2011 01:34:45 -0500 Received: from sj-iport-4.cisco.com ([171.68.10.86]:50850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PdGlg-0000Oj-4p for qemu-devel@nongnu.org; Thu, 13 Jan 2011 01:34:44 -0500 Authentication-Results: sj-iport-4.cisco.com; dkim=neutral (message not signed) header.i=none Received: from sj-core-2.cisco.com ([171.71.177.254]) by sj-iport-4.cisco.com with ESMTP; 13 Jan 2011 06:34:42 +0000 Received: from daahern-lx.cisco.com (sjc-daahern-8915.cisco.com [10.20.182.150]) by sj-core-2.cisco.com (8.13.8/8.14.3) with ESMTP id p0D6YeC4017168; Thu, 13 Jan 2011 06:34:41 GMT From: David Ahern To: qemu-devel@nongnu.org Date: Wed, 12 Jan 2011 23:34:31 -0700 Message-Id: <1294900477-23722-3-git-send-email-daahern@cisco.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1294900477-23722-1-git-send-email-daahern@cisco.com> References: <1294900477-23722-1-git-send-email-daahern@cisco.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: David Ahern Subject: [Qemu-devel] [PATCH 2/8] x86_64 config: fix compile for CONFIG_VMWARE_VGA=n 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 Signed-off-by: David Ahern --- hw/pc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index fface7d..50795e8 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1069,11 +1069,13 @@ void pc_vga_init(PCIBus *pci_bus) } else { isa_cirrus_vga_init(); } +#ifdef CONFIG_VMWARE_VGA } else if (vmsvga_enabled) { if (pci_bus) pci_vmsvga_init(pci_bus); else fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); +#endif #ifdef CONFIG_SPICE } else if (qxl_enabled) { if (pci_bus)