[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] config: handle CONFIG_VGA_ISA=n
From: |
David Ahern |
Subject: |
[Qemu-devel] [PATCH 07/11] config: handle CONFIG_VGA_ISA=n |
Date: |
Fri, 14 Jan 2011 12:12:17 -0700 |
Fix compile errors and remove -M isapc option for CONFIG_VGA_ISA=n.
Signed-off-by: David Ahern <address@hidden>
---
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
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, (continued)
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, Blue Swirl, 2011/01/14
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, David Ahern, 2011/01/14
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, Blue Swirl, 2011/01/14
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, David Ahern, 2011/01/14
- [Qemu-devel] Re: [PATCH 02/11] config: settings from default-configs need to be included in header files, Paolo Bonzini, 2011/01/15
- [Qemu-devel] Re: [PATCH 02/11] config: settings from default-configs need to be included in header files, Blue Swirl, 2011/01/15
[Qemu-devel] [PATCH 03/11] config: fix compile for CONFIG_VMWARE_VGA=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 04/11] config: fix compile for CONFIG_PARALLEL=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 06/11] config: fix compile for CONFIG_NE2000_ISA=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 05/11] remove unused parallel_* variables from pc.c, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 07/11] config: handle CONFIG_VGA_ISA=n,
David Ahern <=
[Qemu-devel] [PATCH 08/11] config: fix compile for CONFIG_IDE_ISA=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 09/11] config: fix compile for CONFIG_FDC=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 10/11] config: add CONFIG_APPLESMC, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 11/11] config: allow none as a configure option to disable all sound cards, David Ahern, 2011/01/14