From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33942 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pdp4d-0005as-6o for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pdp4b-0007JV-TV for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:35 -0500 Received: from sj-iport-5.cisco.com ([171.68.10.87]:2663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pdp4b-0007IX-KZ for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:33 -0500 From: David Ahern Date: Fri, 14 Jan 2011 12:12:17 -0700 Message-Id: <1295032341-6926-8-git-send-email-daahern@cisco.com> In-Reply-To: <1295032341-6926-1-git-send-email-daahern@cisco.com> References: <1295032341-6926-1-git-send-email-daahern@cisco.com> Subject: [Qemu-devel] [PATCH 07/11] config: handle CONFIG_VGA_ISA=n List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Ahern Fix compile errors and remove -M isapc option for CONFIG_VGA_ISA=n. Signed-off-by: David Ahern --- hw/pc.c | 2 ++ hw/pc_piix.c | 6 ++++++ 2 files changed, 8 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 } } } diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 5046947..7d65e37 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -199,6 +199,7 @@ static void pc_init_pci(ram_addr_t ram_size, initrd_filename, cpu_model, 1); } +#ifdef CONFIG_VGA_ISA static void pc_init_isa(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, @@ -212,6 +213,7 @@ static void pc_init_isa(ram_addr_t ram_size, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, 0); } +#endif static QEMUMachine pc_machine = { .name = "pc-0.14", @@ -370,12 +372,14 @@ static QEMUMachine pc_machine_v0_10 = { }, }; +#ifdef CONFIG_VGA_ISA static QEMUMachine isapc_machine = { .name = "isapc", .desc = "ISA-only PC", .init = pc_init_isa, .max_cpus = 1, }; +#endif static void pc_machine_init(void) { @@ -384,7 +388,9 @@ static void pc_machine_init(void) qemu_register_machine(&pc_machine_v0_12); qemu_register_machine(&pc_machine_v0_11); qemu_register_machine(&pc_machine_v0_10); +#ifdef CONFIG_VGA_ISA qemu_register_machine(&isapc_machine); +#endif } machine_init(pc_machine_init); -- 1.7.3.4