From 29565c50134194c9571675bd81f8569c3003dfb0 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Thu, 6 Dec 2018 12:33:49 -0500 Subject: [PATCH] vz: Use consistent error preservation and restoration calls Provide some consistency over error message variable name and usage when saving error messages across possible other errors or possibility of resetting of the last error. Instead of virSaveLastError paired up with virSetError and virFreeError, we should use the newer virErrorPreserveLast and virRestoreError. Signed-off-by: John Ferlan Reviewed-by: Michal Privoznik --- src/vz/vz_driver.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index f8c5232018..21425346ac 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -3206,7 +3206,7 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom, */ if (uri && virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri) < 0) { - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); goto finish; } @@ -3216,7 +3216,7 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom, cookieoutlen = 0; if (vzDomainMigratePerformStep(dom, driver, params, nparams, cookiein, cookieinlen, flags) < 0) { - orig_err = virSaveLastError(); + virErrorPreserveLast(&orig_err); goto finish; } @@ -3242,10 +3242,7 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom, /* confirm step is NOOP thus no need to call it */ done: - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); VIR_FREE(dom_xml); VIR_FREE(uri); VIR_FREE(cookiein); -- GitLab