]> git.proxmox.com Git - qemu.git/commitdiff
e1000: update nc.link_down in e1000_post_load()
authorAmos Kong <akong@redhat.com>
Fri, 28 Sep 2012 02:06:01 +0000 (10:06 +0800)
committerStefan Hajnoczi <stefanha@redhat.com>
Mon, 8 Oct 2012 11:59:40 +0000 (13:59 +0200)
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

index ec3a7c4ecc248d7e9c51d948c1f2496713e4ba67..63fee10794d9bd2394a20aec38cba83ea15b567b 100644 (file)
@@ -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 */