Am 04.05.2012 12:54, schrieb Juan Quintela: > This is the second place that register cpu migration code, it is done > in general in cpu_exec_init(), just remove this call. > > Signed-off-by: Juan Quintela <quint...@redhat.com>
Thanks, I've queued this for qom-1.1 (with extended commit message): http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/qom-1.1 > --- > 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. */ This conflicts with my main_cpu_reset change in the qom-cpu-reset series, I'll apply this to qom-next too and will rebase mine on it. Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg