From a08d43677f87a19daa653774d3c6f71855e23178 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sat, 27 Jun 2009 09:25:07 +0200 Subject: Revert "Introduce reset notifier order" This reverts commit 8217606e6edb49591b4a6fd5a0d1229cebe470a9 (and updates later added users of qemu_register_reset), we solved the problem it originally addressed less invasively. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- hw/pc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/pc.c') diff --git a/hw/pc.c b/hw/pc.c index d7ac6ce..9da07e4 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -84,7 +84,7 @@ static void option_rom_setup_reset(target_phys_addr_t addr, unsigned size) cpu_physical_memory_read(addr, rrd->data, size); rrd->addr = addr; rrd->size = size; - qemu_register_reset(option_rom_reset, 0, rrd); + qemu_register_reset(option_rom_reset, rrd); } static void ioport80_write(void *opaque, uint32_t addr, uint32_t data) @@ -1115,7 +1115,7 @@ static void pc_init1(ram_addr_t ram_size, /* APIC reset callback resets cpu */ apic_init(env); } else { - qemu_register_reset((QEMUResetHandler*)cpu_reset, 0, env); + qemu_register_reset((QEMUResetHandler*)cpu_reset, env); } } -- cgit v1.1