From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 23 Apr 2019 14:04:55 +0000 (+0200)
Subject: networkStartNetworkVirtual: Don't overwrite error in 'err5'
X-Git-Tag: v5.3.0-rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cc1b8360b2df1cb7872d5128918505bd435cdea;p=thirdparty%2Flibvirt.git

networkStartNetworkVirtual: Don't overwrite error in 'err5'

If there's an error when setting up QoS on a bridge the control
jumps over to 'err5' label. Here, the virNetDevBandwidthClear()
is called to clear out any partially set QoS. This function can
also report an error which would overwrite the actual error that
caused us jumping here. Use virErrorPreserveLast() to preserve
the original error.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index ce4f4890f1..77206b4584 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2493,6 +2493,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr driver,
     return 0;
 
  err5:
+    virErrorPreserveLast(&save_err);
     if (def->bandwidth)
        virNetDevBandwidthClear(def->bridge);