From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STdHj-0005fF-9i for qemu-devel@nongnu.org; Sun, 13 May 2012 14:12:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STdHh-00056B-IB for qemu-devel@nongnu.org; Sun, 13 May 2012 14:12:46 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36975 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STdHh-000562-Af for qemu-devel@nongnu.org; Sun, 13 May 2012 14:12:45 -0400 Message-ID: <4FAFF994.6040801@suse.de> Date: Sun, 13 May 2012 20:12:36 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <2c3940829f521e8fb264421a1c8f9e23a3b11434.1336128412.git.quintela@redhat.com> In-Reply-To: <2c3940829f521e8fb264421a1c8f9e23a3b11434.1336128412.git.quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 17/35] mips_fulong2e: cpu vmstate already registered in cpu_exec_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org 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. >=20 > Signed-off-by: Juan Quintela 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(-) >=20 > 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); > } >=20 > - register_savevm(NULL, "cpu", 0, 3, cpu_save, cpu_load, env); > qemu_register_reset(main_cpu_reset, env); >=20 > /* 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 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg