motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

More generic boot devices specification, allowing more devices to be specified

Browse source 
and avoiding per-target hardcoded limitations.
The machine implementations can then check if the given devices match the
actual hardware implementation and firmware API.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3577 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
j_mayer 2007-11-11 01:50:45 +00:00
parent aba9ee8726
commit 28c5af54c6
5 changed files with 125 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

23
hw/ppc_oldworld.c
View file

@ -113,7 +113,7 @@ static void ppc_heathrow_init (int ram_size, int vga_ram_size,
int vga_bios_size, bios_size;
qemu_irq *dummy_irq;
int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index;
int ppc_boot_device = boot_device[0];
int ppc_boot_device;
linux_boot = (kernel_filename != NULL);
@ -212,6 +212,25 @@ static void ppc_heathrow_init (int ram_size, int vga_ram_size,
kernel_size = 0;
initrd_base = 0;
initrd_size = 0;
ppc_boot_device = '\0';
for (i = 0; i < boot_device[i] != '\0'; i++) {
ppc_boot_device = boot_device[i];
/* TOFIX: for now, the second IDE channel is not properly
* emulated. The Mac floppy disk are not emulated.
* For now, OHW cannot boot from the network.
*/
#if 0
if (ppc_boot_device >= 'a' && ppc_boot_device <= 'f')
break;
#else
if (ppc_boot_device >= 'c' && ppc_boot_device <= 'd')
break;
#endif
}
if (ppc_boot_device == '\0') {
fprintf(stderr, "No valid boot device for Mac99 machine\n");
exit(1);
}
}
isa_mem_base = 0x80000000;
@ -272,7 +291,7 @@ static void ppc_heathrow_init (int ram_size, int vga_ram_size,
pmac_format_nvram_partition(nvr, 0x2000);
dbdma_init(&dbdma_mem_index);
macio_init(pci_bus, 0x0017, 1, pic_mem_index, dbdma_mem_index,
cuda_mem_index, nvr, 0, NULL);