From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 21 Aug 2018 13:28:18 +0000 (+0200)
Subject: qemuDomainAttachNetDevice: use only one virErrorPtr variable
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2de3df854a978296145429e7035149646bbcfae1;p=libvirt.git

qemuDomainAttachNetDevice: use only one virErrorPtr variable

Commit f7b5566 added 'save_error' even though the function
already has 'originalError' used in the 'try_remove' section.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 4f290b5648..a30cb1f1a0 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1205,7 +1205,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
     bool charDevPlugged = false;
     bool netdevPlugged = false;
     char *netdev_name;
-    virErrorPtr save_error = NULL;
 
     /* preallocate new slot for device */
     if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0)
@@ -1487,9 +1486,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
             qemuDomainReleaseDeviceAddress(vm, &net->info, NULL);
 
         if (iface_connected) {
-            virErrorPreserveLast(&save_error);
+            virErrorPreserveLast(&originalError);
             virDomainConfNWFilterTeardown(net);
-            virErrorRestore(&save_error);
+            virErrorRestore(&originalError);
 
             if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) {
                 ignore_value(virNetDevMacVLanDeleteWithVPortProfile(