External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: replace virSaveLastError() with virErrorPreserveLast()

Browse Source 
virErrorPreserveLast()/virErrorRestore() (added in commit 8333e7455
back in 2017), do a better better job of saving and restoring the last
libvirt error than virSaveLastError()/virErrorRestore() (they're
simpler, and they also save/restore the system errno).

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2019-08-15 22:28:27 -04:00
parent dac697e8d7
commit 39de732aa7
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/network/bridge_driver.c
View File

@ -2987,13 +2987,12 @@ networkStartNetwork(virNetworkDriverStatePtr driver,
cleanup: cleanup:
if (ret < 0) { if (ret < 0) {
virErrorPtr save_err;
virErrorPreserveLast(&save_err);
virNetworkObjUnsetDefTransient(obj); virNetworkObjUnsetDefTransient(obj);
virErrorPtr save_err = virSaveLastError();
int save_errno = errno;
networkShutdownNetwork(driver, obj); networkShutdownNetwork(driver, obj);
virSetError(save_err); virErrorRestore(&save_err);
virFreeError(save_err);
errno = save_errno;
} }
return ret; return ret;
} }
@ -5596,13 +5595,13 @@ networkPortCreateXML(virNetworkPtr net,
goto cleanup; goto cleanup;
if (virNetworkObjAddPort(obj, portdef, driver->stateDir) < 0) { if (virNetworkObjAddPort(obj, portdef, driver->stateDir) < 0) {
virErrorPtr saved; virErrorPtr save_err;
saved = virSaveLastError(); virErrorPreserveLast(&save_err);
ignore_value(networkReleasePort(obj, portdef)); ignore_value(networkReleasePort(obj, portdef));
virNetworkPortDefFree(portdef); virNetworkPortDefFree(portdef);
virSetError(saved); virErrorRestore(&save_err);
virFreeError(saved);
goto cleanup; goto cleanup;
} }