[libvirt] [PATCH] Don't overwrite virDomainAssignDef errors.

Chris Lalancette clalance at redhat.com
Thu May 20 15:14:04 UTC 2010


Signed-off-by: Chris Lalancette <clalance at redhat.com>
---
 src/qemu/qemu_driver.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f2139c0..6df2356 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6100,8 +6100,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;
@@ -9909,8 +9908,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;
@@ -10140,8 +10138,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;
-- 
1.6.6.1




More information about the libvir-list mailing list