提交 fc9ff1f2 编写于 作者: C Cole Robinson

test: Fix coverity warnings

上级 f8e2da01
...@@ -6547,16 +6547,12 @@ testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, ...@@ -6547,16 +6547,12 @@ testDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot,
{ {
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int ret = -1; int ret = -1;
virDomainSnapshotObjPtr snap = NULL;
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (!(vm = testDomObjFromSnapshot(snapshot))) if (!(vm = testDomObjFromSnapshot(snapshot)))
goto cleanup; goto cleanup;
if (!(snap = testSnapObjFromSnapshot(vm, snapshot)))
goto cleanup;
ret = (vm->current_snapshot && ret = (vm->current_snapshot &&
STREQ(snapshot->name, vm->current_snapshot->def->name)); STREQ(snapshot->name, vm->current_snapshot->def->name));
...@@ -6573,14 +6569,13 @@ testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, ...@@ -6573,14 +6569,13 @@ testDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot,
{ {
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int ret = -1; int ret = -1;
virDomainSnapshotObjPtr snap = NULL;
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (!(vm = testDomObjFromSnapshot(snapshot))) if (!(vm = testDomObjFromSnapshot(snapshot)))
goto cleanup; goto cleanup;
if (!(snap = testSnapObjFromSnapshot(vm, snapshot))) if (!testSnapObjFromSnapshot(vm, snapshot))
goto cleanup; goto cleanup;
ret = 1; ret = 1;
...@@ -6679,7 +6674,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain, ...@@ -6679,7 +6674,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain,
goto cleanup; goto cleanup;
if (redefine) { if (redefine) {
if (!virDomainSnapshotRedefinePrep(domain, vm, &def, &snap, if (virDomainSnapshotRedefinePrep(domain, vm, &def, &snap,
&update_current, flags) < 0) &update_current, flags) < 0)
goto cleanup; goto cleanup;
} else { } else {
...@@ -7078,6 +7073,8 @@ cleanup: ...@@ -7078,6 +7073,8 @@ cleanup:
testDomainEventQueue(privconn, event); testDomainEventQueue(privconn, event);
if (event2) if (event2)
testDomainEventQueue(privconn, event2); testDomainEventQueue(privconn, event2);
} else {
virDomainEventFree(event2);
} }
virObjectUnlock(vm); virObjectUnlock(vm);
testDriverUnlock(privconn); testDriverUnlock(privconn);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册