On 01/31/2011 04:05 AM, Daniel P. Berrange wrote:
>> -
>> - if (qemuDomainSnapshotSetCurrentInactive(vm, driver->snapshotDir) <
0)
>> - goto cleanup;
>
> Why was the SetCurrentInactive line commented out in the move?
It is already invoked in the caller, so it should be redundant
here, and it causes a circular dependency if we leave it in.
Makes sense; do you want to just nuke the #if 0 chunk, then?
>> + if (virDomainObjUnref(obj) > 0) {
>> + /* We can't get the monitor back, so must kill the VM
>> + * to remove danger of it ending up running twice if
>> + * user tries to start it again later */
>> + qemudShutdownVMDaemon(driver, obj, 0);
>
> Wouldn't this cause a compile error, since you renamed the function to
> qemuProcessStop? Indeed:
This is a result of rebasing just before posting it. The fixes
are trivial
Yep, which leaves only the po/POTFILES.in, cppi cleanups, and removal of
'#include "c-ctype.h"' from qemu_driver, and the trailing empty line in
qemu_process.c, (for 'make syntax-check') as the only remaining nits,
also trivial to fix.
ACK with nits fixed.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org