From 840955ff7c9c304237956fc4e672ba8e87aad77b Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 5 May 2009 14:26:02 +0000
Subject: [PATCH] Don't throw away StartVM errors when migrating/restoring in
 qemu driver.

---
 ChangeLog         | 5 +++++
 src/qemu_driver.c | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0195a108ba..00066af594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May  5 10:20:27 EDT 2009 Cole Robinson <crobinso@redhat.com>
+
+	* src/qemu_driver.c: Don't throw away StartVM errors when
+	migrating/restoring in qemu driver.
+
 Tue May  5 10:19:14 EDT 2009 Cole Robinson <crobinso@redhat.com>
 
 	* src/test.c: Small cleanups in test driver VolCreateXML
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index f9fe2ba946..a63a8cb04b 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -225,7 +225,7 @@ qemudAutostartConfigs(struct qemud_driver *driver) {
                 virErrorPtr err = virGetLastError();
                 VIR_ERROR(_("Failed to autostart VM '%s': %s\n"),
                           vm->def->name,
-                          err ? err->message : NULL);
+                          err ? err->message : "");
             } else {
                 virDomainEventPtr event =
                     virDomainEventNewFromObj(vm,
@@ -3270,8 +3270,6 @@ static int qemudDomainRestore(virConnectPtr conn,
     close(fd);
     fd = -1;
     if (ret < 0) {
-        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-                         "%s", _("failed to start VM"));
         if (!vm->persistent) {
             virDomainRemoveInactive(&driver->domains,
                                     vm);
@@ -4767,8 +4765,6 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn,
      */
     snprintf (migrateFrom, sizeof (migrateFrom), "tcp:0.0.0.0:%d", this_port);
     if (qemudStartVMDaemon (dconn, driver, vm, migrateFrom, -1) < 0) {
-        qemudReportError (dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-                          "%s", _("failed to start listening VM"));
         if (!vm->persistent) {
             virDomainRemoveInactive(&driver->domains, vm);
             vm = NULL;