diff options
author | Juan Quintela <quintela@redhat.com> | 2012-05-13 19:32:54 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2012-05-13 19:58:23 +0200 |
commit | 0c9dfe460d0c239cc0dc78d6223118cb63261b45 (patch) | |
tree | 004739268d849c8f4bdaa97c5c565538bea07cca | |
parent | c115cd65784a349aeb4f261d3f327225192ef5a1 (diff) | |
download | qemu-0c9dfe460d0c239cc0dc78d6223118cb63261b45.zip qemu-0c9dfe460d0c239cc0dc78d6223118cb63261b45.tar.gz qemu-0c9dfe460d0c239cc0dc78d6223118cb63261b45.tar.bz2 |
mips_fulong2e: Don't register "cpu" VMState twice
We have the following simplified callgraph in mips_fulong2e_init():
cpu_init() => cpu_mips_init()
object_new()
mips_cpu_initfn()
cpu_exec_init()
register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION,
cpu_save, cpu_load, env)
register_savevm(NULL, "cpu", 0, 3, cpu_save, cpu_load, env)
CPU_SAVE_VERSION is defined as 3 in target-mips/cpu.h.
fulong2e instantiates one CPU, so its cpu_index is 0.
Thus the two are fully identical.
Therefore just remove the second call in fulong2e.
Signed-off-by: Juan Quintela <quintela@redhat.com>
[AF: Extend explanation in commit message]
Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r-- | hw/mips_fulong2e.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index 37dc711..1a8df10 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c @@ -284,7 +284,6 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device, exit(1); } - register_savevm(NULL, "cpu", 0, 3, cpu_save, cpu_load, env); qemu_register_reset(main_cpu_reset, env); /* fulong 2e has 256M ram. */ |