openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemuBuildCommandLine: Don't overwrite errors with NWFilter's one 

Currently, if there has been an error in building command line
process after virtual interfaces has been created, the flow jumps
to 'error' label, where virDomainConfNWFilterTeardown() is
called. This may report an error as well, but should not
overwrite the original cause why we jumped to 'error' label.
This commit is contained in:
Michal Privoznik 2013-04-24 14:06:40 +02:00
parent 278a833922
commit 19c345f2fe
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_command.c
View File

@ -5903,6 +5903,7 @@ qemuBuildCommandLine(virConnectPtr conn,
virDomainSnapshotObjPtr snapshot, virDomainSnapshotObjPtr snapshot,
enum virNetDevVPortProfileOp vmop) enum virNetDevVPortProfileOp vmop)
{ {
virErrorPtr originalError = NULL;
int i, j; int i, j;
const char *emulator; const char *emulator;
char uuid[VIR_UUID_STRING_BUFLEN]; char uuid[VIR_UUID_STRING_BUFLEN];
@ -7833,13 +7834,16 @@ qemuBuildCommandLine(virConnectPtr conn,
virObjectUnref(cfg); virObjectUnref(cfg);
return cmd; return cmd;
no_memory: no_memory:
virReportOOMError(); virReportOOMError();
error: error:
virObjectUnref(cfg); virObjectUnref(cfg);
/* free up any resources in the network driver */ /* free up any resources in the network driver
* but don't overwrite the original error */
originalError = virSaveLastError();
for (i = 0; i <= last_good_net; i++) for (i = 0; i <= last_good_net; i++)
virDomainConfNWFilterTeardown(def->nets[i]); virDomainConfNWFilterTeardown(def->nets[i]);
virSetError(originalError);
virCommandFree(cmd); virCommandFree(cmd);
return NULL; return NULL;
} }