From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=57708 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PdQa3-0000MY-2x
	for qemu-devel@nongnu.org; Thu, 13 Jan 2011 12:03:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1PdQa1-000456-Te
	for qemu-devel@nongnu.org; Thu, 13 Jan 2011 12:03:22 -0500
Received: from mail-gw0-f45.google.com ([74.125.83.45]:52080)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1PdQa1-00044x-Q4
	for qemu-devel@nongnu.org; Thu, 13 Jan 2011 12:03:21 -0500
Received: by gwaa12 with SMTP id a12so438621gwa.4
	for <qemu-devel@nongnu.org>; Thu, 13 Jan 2011 09:03:20 -0800 (PST)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <4D2F3029.4040601@redhat.com>
Date: Thu, 13 Jan 2011 18:02:33 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1294900477-23722-1-git-send-email-daahern@cisco.com>
	<1294900477-23722-7-git-send-email-daahern@cisco.com>
In-Reply-To: <1294900477-23722-7-git-send-email-daahern@cisco.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH 6/8] x86_64 config: fix compile for
	CONFIG_VGA_ISA=n
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: David Ahern <daahern@cisco.com>
Cc: qemu-devel@nongnu.org

On 01/13/2011 07:34 AM, David Ahern wrote:
> Signed-off-by: David Ahern<daahern@cisco.com>
> ---
>   hw/pc.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index e7514fd..11b570f 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1087,8 +1087,10 @@ void pc_vga_init(PCIBus *pci_bus)
>       } else if (std_vga_enabled) {
>           if (pci_bus) {
>               pci_vga_init(pci_bus);
> +#ifdef CONFIG_VGA_ISA
>           } else {
>               isa_vga_init();
> +#endif

Should this be an abort for #ifndef CONFIG_VGA_ISA?  And maybe the isapc 
machine should be disabled altogether?

Paolo