shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

Don't throw away StartVM errors when migrating/restoring in qemu driver.

Browse Source
This commit is contained in:
Cole Robinson 2009-05-05 14:26:02 +00:00
parent 03f3736511
commit 840955ff7c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Tue May 5 10:19:14 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/test.c: Small cleanups in test driver VolCreateXML * src/test.c: Small cleanups in test driver VolCreateXML

6
src/qemu_driver.c
View File

@ -225,7 +225,7 @@ qemudAutostartConfigs(struct qemud_driver *driver) {
virErrorPtr err = virGetLastError(); virErrorPtr err = virGetLastError();
VIR_ERROR(_("Failed to autostart VM '%s': %s\n"), VIR_ERROR(_("Failed to autostart VM '%s': %s\n"),
vm->def->name, vm->def->name,
err ? err->message : NULL); err ? err->message : "");
} else { } else {
virDomainEventPtr event = virDomainEventPtr event =
virDomainEventNewFromObj(vm, virDomainEventNewFromObj(vm,
@ -3270,8 +3270,6 @@ static int qemudDomainRestore(virConnectPtr conn,
close(fd); close(fd);
fd = -1; fd = -1;
if (ret < 0) { if (ret < 0) {
qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
"%s", _("failed to start VM"));
if (!vm->persistent) { if (!vm->persistent) {
virDomainRemoveInactive(&driver->domains, virDomainRemoveInactive(&driver->domains,
vm); vm);
@ -4767,8 +4765,6 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn,
*/ */
snprintf (migrateFrom, sizeof (migrateFrom), "tcp:0.0.0.0:%d", this_port); snprintf (migrateFrom, sizeof (migrateFrom), "tcp:0.0.0.0:%d", this_port);
if (qemudStartVMDaemon (dconn, driver, vm, migrateFrom, -1) < 0) { 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) { if (!vm->persistent) {
virDomainRemoveInactive(&driver->domains, vm); virDomainRemoveInactive(&driver->domains, vm);
vm = NULL; vm = NULL;