diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-31 01:54:04 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-31 01:54:04 +0000 |
| commit | 6ac0e82da197d42b84f6ac5509fa22f90cb357be (patch) | |
| tree | cad0a18876117e7698ee7e18b513be140c9871ff /hw/ppc_prep.c | |
| parent | 926c2d23dfa599ea8c8213342b21cfe56b1d22ca (diff) | |
| download | qemu-6ac0e82da197d42b84f6ac5509fa22f90cb357be.zip qemu-6ac0e82da197d42b84f6ac5509fa22f90cb357be.tar.gz qemu-6ac0e82da197d42b84f6ac5509fa22f90cb357be.tar.bz2 | |
Set boot sequence from command line (Dan Kenigsberg).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3497 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_prep.c')
| -rw-r--r-- | hw/ppc_prep.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 49b3632..c557f87 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -521,7 +521,7 @@ CPUReadMemoryFunc *PPC_prep_io_read[] = { #define NVRAM_SIZE 0x2000 /* PowerPC PREP hardware initialisation */ -static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, +static void ppc_prep_init (int ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, const char **fd_filename, int snapshot, const char *kernel_filename, const char *kernel_cmdline, @@ -539,6 +539,7 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, ppc_def_t *def; PCIBus *pci_bus; qemu_irq *i8259; + int ppc_boot_device = boot_device[0]; sysctrl = qemu_mallocz(sizeof(sysctrl_t)); if (sysctrl == NULL) @@ -607,7 +608,7 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, initrd_base = 0; initrd_size = 0; } - boot_device = 'm'; + ppc_boot_device = 'm'; } else { kernel_base = 0; kernel_size = 0; @@ -695,7 +696,7 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, nvram.opaque = m48t59; nvram.read_fn = &m48t59_read; nvram.write_fn = &m48t59_write; - PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "PREP", ram_size, boot_device, + PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "PREP", ram_size, ppc_boot_device, kernel_base, kernel_size, kernel_cmdline, initrd_base, initrd_size, |