[Qemu-devel] [6552] Fix bug in omap_sx1.c introduced by r6344

[Aurelien Jarno]

Revision: 6552
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6552
Author:   aurel32
Date:     2009-02-07 15:20:14 +0000 (Sat, 07 Feb 2009)

Log Message:
-----------
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 <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>

Modified Paths:
--------------
    trunk/hw/omap_sx1.c

Modified: trunk/hw/omap_sx1.c
===================================================================
--- trunk/hw/omap_sx1.c 2009-02-07 15:19:40 UTC (rev 6551)
+++ trunk/hw/omap_sx1.c 2009-02-07 15:20:14 UTC (rev 6552)
@@ -116,7 +116,7 @@
 };
 
 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 @@
         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);
 }