From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LVoyi-0000gN-1i for qemu-devel@nongnu.org; Sat, 07 Feb 2009 10:20:20 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LVoyh-0000fw-9q for qemu-devel@nongnu.org; Sat, 07 Feb 2009 10:20:19 -0500 Received: from [199.232.76.173] (port=48931 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LVoyh-0000fp-2d for qemu-devel@nongnu.org; Sat, 07 Feb 2009 10:20:19 -0500 Received: from savannah.gnu.org ([199.232.41.3]:43472 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LVoyg-0003Na-Om for qemu-devel@nongnu.org; Sat, 07 Feb 2009 10:20:18 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LVoyf-00006k-8b for qemu-devel@nongnu.org; Sat, 07 Feb 2009 15:20:17 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LVoye-00006f-CJ for qemu-devel@nongnu.org; Sat, 07 Feb 2009 15:20:16 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Sat, 07 Feb 2009 15:20:16 +0000 Subject: [Qemu-devel] [6552] Fix bug in omap_sx1.c introduced by r6344 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Signed-off-by: Aurelien Jarno 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); }