[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] Fix bug in omap_sx1.c introduced by r6344
From: |
Stefan Weil |
Subject: |
[Qemu-devel] [PATCH] Fix bug in omap_sx1.c introduced by r6344 |
Date: |
Fri, 06 Feb 2009 22:08:23 +0100 |
User-agent: |
Mozilla-Thunderbird 2.0.0.19 (X11/20090103) |
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
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 <address@hidden>
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);
}
- [Qemu-devel] [PATCH] Fix bug in omap_sx1.c introduced by r6344,
Stefan Weil <=