qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: Stefan Hajnoczi <stefanha@gmail.com>,
	Amos Kong <akong@redhat.com>,
	qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 2/4] e1000: update nc.link_down in e1000_post_load()
Date: Mon,  8 Oct 2012 14:03:01 +0200	[thread overview]
Message-ID: <1349697783-19368-3-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1349697783-19368-1-git-send-email-stefanha@redhat.com>

From: Amos Kong <akong@redhat.com>

This patch introduced e1000_post_load(), it will be called in the end of
migration. nc.link_down could not be migrated, this patch updates
link_down in e1000_post_load() to keep it coincident with real link
status.

Signed-off-by: Amos Kong <akong@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
---
 hw/e1000.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hw/e1000.c b/hw/e1000.c
index ec3a7c4..63fee10 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -1079,11 +1079,23 @@ static bool is_version_1(void *opaque, int version_id)
     return version_id == 1;
 }
 
+static int e1000_post_load(void *opaque, int version_id)
+{
+    E1000State *s = opaque;
+
+    /* nc.link_down can't be migrated, so infer link_down according
+     * to link status bit in mac_reg[STATUS] */
+    s->nic->nc.link_down = (s->mac_reg[STATUS] & E1000_STATUS_LU) == 0;
+
+    return 0;
+}
+
 static const VMStateDescription vmstate_e1000 = {
     .name = "e1000",
     .version_id = 2,
     .minimum_version_id = 1,
     .minimum_version_id_old = 1,
+    .post_load = e1000_post_load,
     .fields      = (VMStateField []) {
         VMSTATE_PCI_DEVICE(dev, E1000State),
         VMSTATE_UNUSED_TEST(is_version_1, 4), /* was instance id */
-- 
1.7.11.4

  parent reply	other threads:[~2012-10-08 12:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-08 12:02 [Qemu-devel] [PULL 0/4] Net patches Stefan Hajnoczi
2012-10-08 12:03 ` [Qemu-devel] [PATCH 1/4] rtl8139: implement 8139cp link status Stefan Hajnoczi
2012-10-08 12:03 ` Stefan Hajnoczi [this message]
2012-10-08 12:03 ` [Qemu-devel] [PATCH 3/4] virtio-net: update nc.link_down in virtio_net_load() Stefan Hajnoczi
2012-10-08 12:03 ` [Qemu-devel] [PATCH 4/4] net: consolidate NetClientState header files into one Stefan Hajnoczi
2012-10-12 16:18 ` [Qemu-devel] [PULL 0/4] Net patches 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=1349697783-19368-3-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=akong@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.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).