diff --git a/ChangeLog b/ChangeLog index 07681e2fc2..f56fcc5f8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon May 11 09:35:26 EDT 2009 Cole Robinson + + * src/qemu_driver.c: Report qemu log data if we fail to daemonize. + Mon May 11 09:29:52 EDT 2009 Cole Robinson * src/libvirt_private.syms src/util.[ch]: Add a helper function diff --git a/src/qemu_driver.c b/src/qemu_driver.c index bafdd73f78..5c8d336a1d 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1456,8 +1456,17 @@ static int qemudStartVMDaemon(virConnectPtr conn, _("Domain %s didn't show up\n"), vm->def->name); ret = -1; } - } else - ret = -1; + } else if (ret == -2) { + /* The virExec process that launches the daemon failed. Pending on + * when it failed (we can't determine for sure), there may be + * extra info in the domain log (if the hook failed for example). + * + * Pretend like things succeeded, and let 'WaitForMonitor' report + * the log contents for us. + */ + vm->pid = child; + ret = 0; + } vm->state = migrateFrom ? VIR_DOMAIN_PAUSED : VIR_DOMAIN_RUNNING;