qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Andreas Färber" <afaerber@suse.de>,
	anthony@codemonkey.ws, "Juan Quintela" <quintela@redhat.com>
Subject: [Qemu-devel] [PATCH 7/7] mips_fulong2e: Don't register "cpu" VMState twice
Date: Sun, 13 May 2012 20:27:45 +0200	[thread overview]
Message-ID: <1336933665-3867-8-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1336933665-3867-1-git-send-email-afaerber@suse.de>

From: Juan Quintela <quintela@redhat.com>

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>
---
 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. */
-- 
1.7.7

  parent reply	other threads:[~2012-05-13 18:28 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-13 18:27 [Qemu-devel] [PULL for-1.1-rc2] Fixes from QOM-related series Andreas Färber
2012-05-13 18:27 ` [Qemu-devel] [PATCH 1/7] target-mips: Remove commented-out function declaration Andreas Färber
2012-05-13 18:27 ` [Qemu-devel] [PATCH 2/7] qom: Documentation addition for object_class_by_name() Andreas Färber
2012-05-13 18:27 ` [Qemu-devel] [PATCH 3/7] target-i386: Defer MCE init Andreas Färber
2012-05-13 18:27 ` [Qemu-devel] [PATCH 4/7] qdev: Use object_property_print() in info qtree Andreas Färber
2012-05-13 18:27 ` [Qemu-devel] [PATCH 5/7] qdev: Fix adding of ptr properties Andreas Färber
2012-05-13 18:27 ` [Qemu-devel] [PATCH 6/7] pc: Add back PCI.rombar compat property Andreas Färber
2012-05-13 18:27 ` Andreas Färber [this message]
2012-05-14 12:56 ` [Qemu-devel] [PULL for-1.1-rc2] Fixes from QOM-related series Luiz Capitulino
2012-05-14 20:08 ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1336933665-3867-8-git-send-email-afaerber@suse.de \
    --to=afaerber@suse.de \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).