From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=34727 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PdQyG-0003lE-IZ
	for qemu-devel@nongnu.org; Thu, 13 Jan 2011 12:28:26 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <daahern@cisco.com>) id 1PdQyE-0000HG-S9
	for qemu-devel@nongnu.org; Thu, 13 Jan 2011 12:28:24 -0500
Received: from sj-iport-1.cisco.com ([171.71.176.70]:53032)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <daahern@cisco.com>) id 1PdQyE-0000Gx-MQ
	for qemu-devel@nongnu.org; Thu, 13 Jan 2011 12:28:22 -0500
Message-ID: <4D2F3634.9040804@cisco.com>
Date: Thu, 13 Jan 2011 10:28:20 -0700
From: David Ahern <daahern@cisco.com>
MIME-Version: 1.0
References: <1294900477-23722-1-git-send-email-daahern@cisco.com>
	<1294900477-23722-7-git-send-email-daahern@cisco.com>
	<4D2F3029.4040601@redhat.com>
In-Reply-To: <4D2F3029.4040601@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
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: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org



On 01/13/11 10:02, Paolo Bonzini wrote:
> 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

If that's desired I can change that to:

#ifdef CONFIG_VGA_ISA
         } else {
             isa_vga_init();
#else
             abort();
#endif


David