From: Dor Laor <[EMAIL PROTECTED]>
The device can be down when the timer pops.
If it is down it will cause segfault.
It might happen on migration but also on regular operation
when the device sends packets and quickly goes down before
the host timer pops.
Signed-off-by: Dor Laor <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/qemu/hw/virtio-net.c b/qemu/hw/virtio-net.c
index b0c6856..3d54c4e 100644
--- a/qemu/hw/virtio-net.c
+++ b/qemu/hw/virtio-net.c
@@ -274,8 +274,13 @@ static void virtio_net_tx_timer(void *opaque)
{
VirtIONet *n = opaque;
- n->tx_vq->vring.used->flags &= ~VRING_USED_F_NO_NOTIFY;
n->tx_timer_active = 0;
+
+ /* Just in case the driver is not ready on more */
+ if (!(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK))
+ return;
+
+ n->tx_vq->vring.used->flags &= ~VRING_USED_F_NO_NOTIFY;
virtio_net_flush_tx(n, n->tx_vq);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
