mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
Don't throw away StartVM errors when migrating/restoring in qemu driver.
This commit is contained in:
parent
03f3736511
commit
840955ff7c
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user