diff options
| author | Jan Kiszka | 2009-06-27 09:25:07 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2009-06-29 21:18:08 +0200 |
| commit | a08d43677f87a19daa653774d3c6f71855e23178 (patch) | |
| tree | b37c74bd58d4dd7c21fbdea080a8b543e27a2ba9 /hw/pc.c | |
| parent | monitor: Make pci_add device options truely optional (diff) | |
| download | qemu-a08d43677f87a19daa653774d3c6f71855e23178.tar.gz qemu-a08d43677f87a19daa653774d3c6f71855e23178.tar.xz qemu-a08d43677f87a19daa653774d3c6f71855e23178.zip | |
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 <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc.c')
| -rw-r--r-- | hw/pc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); } } |