virtio-net migration fix
PATCH 1/1 virtio-net migration fix
We are failing to save whether the guest will supply us rx buffers using the new mergeable format; this can cause a migrated guest to crash with:
virtio-net header not in first element
--- hw/virtio-net.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
hw/virtio-net.c +2 -0
@@ -275,6 +275,7 @@ static void virtio_net_save(QEMUFile *f, void *opaque)qemu_put_buffer (f, n->mac,6 );qemu_put_be32 (f, n->tx_timer_active); +qemu_put_be32 (f, n->mergeable_rx_bufs); }static int virtio_net_load (QEMUFile *f,void *opaque,int version_id)
@@ -288,6 +289,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)qemu_get_buffer (f, n->mac,6 ); n->tx_timer_active =qemu_get_be32 (f); + n->mergeable_rx_bufs =qemu_get_be32 (f);if (n->tx_timer_active) { qemu_mod_timer(n->tx_timer,
Signature · 1 line
1.6.0.6
Quoted 6 lines · Mark McLoughlin
We are failing to save whether the guest will supply us rx buffers using the new mergeable format; this can cause a migrated guest to crash with:
virtio-net header not in first element
We should bump the version number so that we can gracefully fail migrations where the dest or source end is broken. I would make the virtio_net_load not accept version 1 saves too just to be on the safe side.
Regards,
Anthony Liguori
Quoted 26 lines
Signed-off-by Mark McLoughlin <[email protected]>--- hw/virtio-net.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)hw/virtio-net.c +2
-0@@ -275,6 +275,7 @@ static void virtio_net_save(QEMUFile *f, void *opaque)qemu_put_buffer (f, n->mac,6 );qemu_put_be32 (f, n->tx_timer_active); +qemu_put_be32 (f, n->mergeable_rx_bufs); }static int virtio_net_load (QEMUFile *f,void *opaque,int version_id)@@ -288,6 +289,7 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)qemu_get_buffer (f, n->mac,6 ); n->tx_timer_active =qemu_get_be32 (f); + n->mergeable_rx_bufs =qemu_get_be32 (f);if (n->tx_timer_active) { qemu_mod_timer(n->tx_timer,
Quoted 11 lines · Anthony Liguori
Quoted 6 lines · Mark McLoughlin
We are failing to save whether the guest will supply us rx buffers using the new mergeable format; this can cause a migrated guest to crash with:
virtio-net header not in first element
We should bump the version number so that we can gracefully fail migrations where the dest or source end is broken. I would make the
virtio_net_loadnot accept version 1 saves too just to be on the safe side.
Thanks, I should have seen that myself ...
Cheers,
Mark.
From: Mark McLoughlin <[email protected]>
Subject: [PATCH] virtio-net migration fix
We are failing to save whether the guest will supply us rx buffers using the new mergeable format; this can cause a migrated guest to crash with:
virtio-net header not in first element
Bump the savevm version number and refuse to load v1 saves just to be on the safe side.
--- hw/virtio-net.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
hw/virtio-net.c +4 -2
@@ -275,19 +275,21 @@ static void virtio_net_save(QEMUFile *f, void *opaque)qemu_put_buffer (f, n->mac,6 );qemu_put_be32 (f, n->tx_timer_active); +qemu_put_be32 (f, n->mergeable_rx_bufs); }static int virtio_net_load (QEMUFile *f,void *opaque,int version_id) {VirtIONet *n = opaque; -if (version_id !=1 ) +if (version_id !=2 )return -EINVAL ;virtio_load (&n->vdev, f);qemu_get_buffer (f, n->mac,6 ); n->tx_timer_active =qemu_get_be32 (f); + n->mergeable_rx_bufs =qemu_get_be32 (f);if (n->tx_timer_active) { qemu_mod_timer(n->tx_timer,
@@ -322,7 +324,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) n->tx_timer_active =0 ; n->mergeable_rx_bufs =0 ; -register_savevm ("virtio-net" , virtio_net_id++,1 , +register_savevm ("virtio-net" , virtio_net_id++,2 , virtio_net_save, virtio_net_load, n);return (PCIDevice *)n;
Signature · 1 line
1.6.0.6
Anthony Liguori
AppliedQuoted 13 lines
Thanks, I should have seen that myself ...
Cheers,
Mark.From: Mark McLoughlin <[email protected]>
Subject: [PATCH] virtio-net migration fixWe are failing to save whether the guest will supply us rx buffers using the new mergeable format; this can cause a migrated guest to crash with:
Quoted 7 lines
virtio-net header not in first element
Bump the savevm version number and refuse to load v1 saves just to be on the safe side.
Signed-off-by Mark McLoughlin <[email protected]>
Applied. Thanks.
Regards,
Anthony Liguori