From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=40469 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PdnmO-0004YT-3H
	for qemu-devel@nongnu.org; Fri, 14 Jan 2011 12:49:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <daahern@cisco.com>) id 1PdnmN-0003I9-2E
	for qemu-devel@nongnu.org; Fri, 14 Jan 2011 12:49:39 -0500
Received: from sj-iport-5.cisco.com ([171.68.10.87]:51130)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <daahern@cisco.com>) id 1PdnmM-0003I1-UA
	for qemu-devel@nongnu.org; Fri, 14 Jan 2011 12:49:39 -0500
Message-ID: <4D308CB0.6000907@cisco.com>
Date: Fri, 14 Jan 2011 10:49:36 -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> <4D2F3634.9040804@cisco.com>
	<4D2FFBE7.407@redhat.com>
In-Reply-To: <4D2FFBE7.407@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 <qemu-devel@nongnu.org>



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