diff --git a/ChangeLog b/ChangeLog index 0195a108ba98d993994093e65a564d7386763cd0..00066af594f27a911176db197d98d5e629dee46c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue May 5 10:20:27 EDT 2009 Cole Robinson + + * 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 * src/test.c: Small cleanups in test driver VolCreateXML diff --git a/src/qemu_driver.c b/src/qemu_driver.c index f9fe2ba946d8a8e64a1981eace1606d8d3ee65d5..a63a8cb04b1b85d887cb0c209fc3c5fde1ed82b6 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;