qemuDomainAttachNetDevice: use only one virErrorPtr variable

[libvirt] [PATCH] qemuDomainAttachNetDevice: use only one virErrorPtr variable

Ján Tomko posted 1 patch 5 years, 7 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/1865ed4e1ba4fb4c5a9bb23dc0afcc93e1809d68.1535451832.git.jtomko@redhat.com

Test syntax-check passed

src/qemu/qemu_hotplug.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

Expand all Fold all

[libvirt] [PATCH] qemuDomainAttachNetDevice: use only one virErrorPtr variable

Posted by Ján Tomko 5 years, 7 months ago

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>
---
 src/qemu/qemu_hotplug.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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(
-- 
2.16.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemuDomainAttachNetDevice: use only one virErrorPtr variable

Posted by John Ferlan 5 years, 7 months ago


On 08/28/2018 06:23 AM, Ján Tomko wrote:
> 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>
> ---
>  src/qemu/qemu_hotplug.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 

Reviewed-by: John Ferlan <jferlan@redhat.com>
SFF

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list