[Qemu-devel] Re: [PATCH 6/8] x86_64 config: fix compile for CONFIG_VGA_ISA=n

[David Ahern]

On 01/13/11 10:02, Paolo Bonzini wrote:
> On 01/13/2011 07:34 AM, David Ahern wrote:
>> Signed-off-by: David Ahern<address@hidden>
>> ---
>>   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