From: Chris Lalancette <clalance@redhat.com>
Date: Tue, 11 May 2010 20:44:09 +0000 (-0400)
Subject: Don't overwrite virDomainAssignDef errors.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fff6be0cc00177b6ff75c8aa71ede46721ddb553;p=libvirt.git

Don't overwrite virDomainAssignDef errors.

Signed-off-by: Chris Lalancette <clalance@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f027dc3132..28860c9dd3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6284,8 +6284,7 @@ static int qemudDomainRestore(virConnectPtr conn,
     if (!(vm = virDomainAssignDef(driver->caps,
                                   &driver->domains,
                                   def, true))) {
-        qemuReportError(VIR_ERR_OPERATION_FAILED,
-                        "%s", _("failed to assign new VM"));
+        /* virDomainAssignDef already set the error */
         goto cleanup;
     }
     def = NULL;
@@ -10028,8 +10027,7 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn,
     if (!(vm = virDomainAssignDef(driver->caps,
                                   &driver->domains,
                                   def, true))) {
-        qemuReportError(VIR_ERR_OPERATION_FAILED,
-                        "%s", _("failed to assign new VM"));
+        /* virDomainAssignDef already set the error */
         goto cleanup;
     }
     def = NULL;
@@ -10259,8 +10257,7 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn,
     if (!(vm = virDomainAssignDef(driver->caps,
                                   &driver->domains,
                                   def, true))) {
-        qemuReportError(VIR_ERR_OPERATION_FAILED,
-                        "%s", _("failed to assign new VM"));
+        /* virDomainAssignDef already set the error */
         goto cleanup;
     }
     def = NULL;