From 6117c3582906a3a7484beb3700c66df2b3f1d441 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 28 Jun 2012 16:26:07 +0200 Subject: [PATCH] conf: Don't shadow error from virGetDomain() virGetDomain() does a good job of reporting errors itself. This patch removes shadowing of that error in virDomainListPopulate(). --- src/conf/virdomainlist.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/conf/virdomainlist.c b/src/conf/virdomainlist.c index f9fbde8989..2b0b87881b 100644 --- a/src/conf/virdomainlist.c +++ b/src/conf/virdomainlist.c @@ -117,8 +117,10 @@ virDomainListPopulate(void *payload, return; } - if (!(dom = virGetDomain(data->conn, vm->def->name, vm->def->uuid))) - goto no_memory; + if (!(dom = virGetDomain(data->conn, vm->def->name, vm->def->uuid))) { + data->error = true; + goto cleanup; + } dom->id = vm->def->id; @@ -127,11 +129,6 @@ virDomainListPopulate(void *payload, cleanup: virDomainObjUnlock(vm); return; - -no_memory: - virReportOOMError(); - data->error = true; - goto cleanup; } #undef MATCH