summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-07 15:20:14 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-07 15:20:14 +0000
commit5f70aab1da0a71750a393e2d0d8796386b18a17d (patch)
treef48413273b937fea6409d7b447275c377c7c0363 /hw
parentdfb021bc6d79344177e8e5b4a23b40d1d84cc0d8 (diff)
downloadhqemu-5f70aab1da0a71750a393e2d0d8796386b18a17d.zip
hqemu-5f70aab1da0a71750a393e2d0d8796386b18a17d.tar.gz
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 <weil@mail.berlios.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6552 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/omap_sx1.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 98211ef..afd2581 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);
}
OpenPOWER on IntegriCloud