From: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri, 13 Sep 2019 12:41:29 +0000 (+0100)
Subject: qemu: fix detach of hostdev based network interface
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b9ed82c9fba30666428f482b4830a26ffb0a4f52;p=libvirt.git

qemu: fix detach of hostdev based network interface

This fixes bug in

  commit bbe2aa627f621e6749af374b22856184d1f351dc
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   Thu Jul 26 17:24:30 2018 +0100

    conf: simplify link from hostdev back to network device

    hostdevs have a link back to the original network device. This is fairly
    generic accepting any type of device, however, we don't intend to make
    use of this approach in future. It can thus be specialized to network
    devices.

    Reviewed-by: Cole Robinson <crobinso@redhat.com>
    Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

which mistakenly deleted the assignment to the 'net' variable,
which meant we never invoked the network driver release callback

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index bd8868b0f7..16070f2a57 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -4561,6 +4561,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
     }
 
     if (hostdev->parentnet) {
+        net = hostdev->parentnet;
         for (i = 0; i < vm->def->nnets; i++) {
             if (vm->def->nets[i] == hostdev->parentnet) {
                 virDomainNetRemove(vm->def, i);