From 5f70aab1da0a71750a393e2d0d8796386b18a17d Mon Sep 17 00:00:00 2001 From: aurel32 Date: Sat, 7 Feb 2009 15:20:14 +0000 Subject: [PATCH] Fix bug in omap_sx1.c introduced by r6344 This patch changes the QEMUMachine init function not to take a DisplayState as an argument because is not needed any more; Signed-off-by: Stefan Weil Signed-off-by: Aurelien Jarno git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6552 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/omap_sx1.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c index 98211efe28..afd2581fa6 100644 --- a/hw/omap_sx1.c +++ b/hw/omap_sx1.c @@ -116,7 +116,7 @@ static struct arm_boot_info sx1_binfo = { }; static void sx1_init(ram_addr_t ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, + const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model, const int version) @@ -201,24 +201,25 @@ static void sx1_init(ram_addr_t ram_size, int vga_ram_size, cpu->env->regs[15] = 0x00000000; } - qemu_console_resize(ds, 640, 480); + /* TODO: fix next line */ + //~ qemu_console_resize(ds, 640, 480); } static void sx1_init_v1(ram_addr_t ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, + const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - sx1_init(ram_size, vga_ram_size, boot_device, ds, kernel_filename, + sx1_init(ram_size, vga_ram_size, boot_device, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, 1); } static void sx1_init_v2(ram_addr_t ram_size, int vga_ram_size, - const char *boot_device, DisplayState *ds, + const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - sx1_init(ram_size, vga_ram_size, boot_device, ds, kernel_filename, + sx1_init(ram_size, vga_ram_size, boot_device, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, 2); }