On 10/10/2011 11:53 PM, Daniel Veillard wrote:
On Mon, Oct 10, 2011 at 03:35:42PM -0600, Eric Blake wrote:
> To date, disk snapshots worked by accident, as they were always
> using hmp fallback due to a typo in commit e702b5b not picking up
> on the (intentional) difference in command names between the two
> monitor protocols.
>
> * src/qemu/qemu_monitor_json.c (qemuMonitorJSONDiskSnapshot):
> Spell QMP command correctly.
> Reported by Luiz Capitulino.
> - VIR_DEBUG("snapshot-blkdev-sync command not found,
trying HMP");
> + VIR_DEBUG("blockdev-snapshot-sync command not found, trying
HMP");
> ret = qemuMonitorTextDiskSnapshot(mon, device, file);
> goto cleanup;
> }
Whoops :-) ACK !
Pushed.
I still need to test what happens when both QMP and HMP commands are
missing, to make sure libvirt issues a sane error message (yesterday, I
attempted to fake this with gdb to cause a failure, and got the dreaded
'unknown error' message, but think I botched my test, so I'll feel
better once I repeat the test with a real qemu rather than gdb).
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org