diff options
author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-11-21 23:33:12 +0000 |
---|---|---|
committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-11-21 23:33:12 +0000 |
commit | c68ea7043f2ed4c631d1e3a4f35afe247d5ca063 (patch) | |
tree | 64b42bfd3fe62caf019e384cee26e80b98da831d /hw/sun4m.c | |
parent | 173d6cfe5129301a3a8f2570223aaa47a815f343 (diff) | |
download | hqemu-c68ea7043f2ed4c631d1e3a4f35afe247d5ca063.zip hqemu-c68ea7043f2ed4c631d1e3a4f35afe247d5ca063.tar.gz |
cpu_single_env usage fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1644 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sun4m.c')
-rw-r--r-- | hw/sun4m.c | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -210,12 +210,19 @@ void qemu_system_powerdown(void) slavio_set_power_fail(slavio_misc, 1); } +static void main_cpu_reset(void *opaque) +{ + CPUState *env = opaque; + cpu_reset(env); +} + /* Sun4m hardware initialisation */ static void sun4m_init(int ram_size, int vga_ram_size, int boot_device, DisplayState *ds, const char **fd_filename, int snapshot, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename) { + CPUState *env; char buf[1024]; int ret, linux_boot; unsigned int i; @@ -223,6 +230,10 @@ static void sun4m_init(int ram_size, int vga_ram_size, int boot_device, linux_boot = (kernel_filename != NULL); + env = cpu_init(); + register_savevm("cpu", 0, 3, cpu_save, cpu_load, env); + qemu_register_reset(main_cpu_reset, env); + /* allocate RAM */ cpu_register_physical_memory(0, ram_size, 0); |