From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LVXw3-0000dI-R3 for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:08:27 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LVXw3-0000bk-5J for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:08:27 -0500 Received: from [199.232.76.173] (port=51576 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LVXw3-0000bW-1e for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:08:27 -0500 Received: from moutng.kundenserver.de ([212.227.126.177]:61614) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LVXw2-0007jd-4g for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:08:26 -0500 Received: from localhost ([127.0.0.1] ident=stefan) by flocke.weilnetz.de with esmtp (Exim 4.69) (envelope-from ) id 1LVXw0-0006fw-3s for qemu-devel@nongnu.org; Fri, 06 Feb 2009 22:08:24 +0100 Message-ID: <498CA6C7.5040004@mail.berlios.de> Date: Fri, 06 Feb 2009 22:08:23 +0100 From: Stefan Weil MIME-Version: 1.0 Subject: [Qemu-devel] [PATCH] Fix bug in omap_sx1.c introduced by r6344 Content-Type: multipart/mixed; boundary="------------040607020601060109060406" Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers This is a multi-part message in MIME format. --------------040607020601060109060406 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Hello, This patch changes the QEMUMachine init function not to take a DisplayState as an argument because is not needed any more. r6344 changed the interface but omap_sx1.c still used the old code. This results in a compiler warning, but I'm also very sure the old code will no longer work. Because of the now missing DisplayState *ds, qemu_console_resize no longer can be called - maybe this is something which remains to be done. Regards Stefan Weil --------------040607020601060109060406 Content-Type: text/x-diff; name="omap_sx1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="omap_sx1.patch" Fix bug 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 Index: trunk/hw/omap_sx1.c =================================================================== --- trunk.orig/hw/omap_sx1.c 2009-02-06 22:00:09.000000000 +0100 +++ trunk/hw/omap_sx1.c 2009-02-06 22:00:36.000000000 +0100 @@ -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); } --------------040607020601060109060406--