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

[David Ahern <daahern@cisco.com>]

On 01/14/11 00:31, Paolo Bonzini wrote:
> On 01/13/2011 06:28 PM, David Ahern wrote:
>>>> @@ -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
> 
> Please check if you can trigger the abort via -M isapc (I think so, but
> I'm not sure).  If I am correct, the better solution is to disable isapc.
> 
> Paolo

Yes, it would trigger the abort.

And, that test case exposed a larger issue: config-devices.mak and
config-all-devices.mak are not added to the config-host.h and
x86_64-softmmu/config-target.h config files which means the addition of
the ifdef makes it disabled all the time -- regardless of the y/n
setting in the config*.mak file. ie., a patch is needed to get the
config*device.mak options added to the config*.h file.

David