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/versatilepb.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/versatilepb.c')
-rw-r--r-- | hw/versatilepb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 2e3dedd..31d58ef 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -151,8 +151,9 @@ static qemu_irq *vpb_sic_init(uint32_t base, qemu_irq *parent, int irq) peripherans and expansion busses. For now we emulate a subset of the PB peripherals and just change the board ID. */ -static void versatile_init(int ram_size, int vga_ram_size, int boot_device, - DisplayState *ds, const char **fd_filename, int snapshot, +static void versatile_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, const char *initrd_filename, const char *cpu_model, int board_id) @@ -266,7 +267,7 @@ static void versatile_init(int ram_size, int vga_ram_size, int boot_device, initrd_filename, board_id, 0x0); } -static void vpb_init(int ram_size, int vga_ram_size, int boot_device, +static void vpb_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, const char *initrd_filename, const char *cpu_model) @@ -277,7 +278,7 @@ static void vpb_init(int ram_size, int vga_ram_size, int boot_device, initrd_filename, cpu_model, 0x183); } -static void vab_init(int ram_size, int vga_ram_size, int boot_device, +static void vab_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, const char *initrd_filename, const char *cpu_model) |