External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-08 22:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report qemu log data if we fail to daemonize the process.

Browse Source 
This ensures the user will actually see 'hook' function error output.
This commit is contained in:
Cole Robinson 2009-05-11 13:37:19 +00:00
parent 79d9d2432f
commit 27d72bd517
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon May 11 09:35:26 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/qemu_driver.c: Report qemu log data if we fail to daemonize.
Mon May 11 09:29:52 EDT 2009 Cole Robinson <crobinso@redhat.com> Mon May 11 09:29:52 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/libvirt_private.syms src/util.[ch]: Add a helper function * src/libvirt_private.syms src/util.[ch]: Add a helper function

13
src/qemu_driver.c
View File

@ -1456,8 +1456,17 @@ static int qemudStartVMDaemon(virConnectPtr conn,
_("Domain %s didn't show up\n"), vm->def->name); _("Domain %s didn't show up\n"), vm->def->name);
ret = -1; ret = -1;
} }
} else } else if (ret == -2) {
ret = -1; /* 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; vm->state = migrateFrom ? VIR_DOMAIN_PAUSED : VIR_DOMAIN_RUNNING;