thebeanogamer / rpms / qemu-kvm

Forked from rpms/qemu-kvm 5 months ago
Clone
902636
From 92fb4f6cdde32652352a0a831a2ba815701a4014 Mon Sep 17 00:00:00 2001
902636
From: Juan Quintela <quintela@redhat.com>
902636
Date: Fri, 3 Jul 2020 12:37:05 -0400
902636
Subject: [PATCH 4/4] virtio-net: fix removal of failover device
902636
902636
RH-Author: Juan Quintela <quintela@redhat.com>
902636
Message-id: <20200703123705.7175-2-quintela@redhat.com>
902636
Patchwork-id: 97901
902636
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 1/1] virtio-net: fix removal of failover device
902636
Bugzilla:
902636
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
902636
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
902636
If you have a networking device and its virtio failover device, and
902636
you remove them in this order:
902636
- virtio device
902636
- the real device
902636
902636
You get qemu crash.
902636
See bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1820120
902636
902636
Bug exist on qemu 4.2 and 5.0.
902636
But in 5.0 don't shows because commit
902636
77b06bba62034a87cc61a9c8de1309ae3e527d97
902636
902636
somehow papers over it.
902636
902636
CC: Jason Wang <jasowang@redhat.com>
902636
CC: Michael S. Tsirkin <mst@redhat.com>
902636
902636
Signed-off-by: Juan Quintela <quintela@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 hw/net/virtio-net.c | 1 +
902636
 1 file changed, 1 insertion(+)
902636
902636
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
902636
index f325440d01..dabeb9e720 100644
902636
--- a/hw/net/virtio-net.c
902636
+++ b/hw/net/virtio-net.c
902636
@@ -3091,6 +3091,7 @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)
902636
     g_free(n->vlans);
902636
 
902636
     if (n->failover) {
902636
+        device_listener_unregister(&n->primary_listener);
902636
         g_free(n->primary_device_id);
902636
         g_free(n->standby_id);
902636
         qobject_unref(n->primary_device_dict);
902636
-- 
902636
2.27.0
902636