External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-16 22:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use \r instead of \n for QEMU monitor

Browse Source
This commit is contained in:
Daniel P. Berrange 2007-08-14 00:15:16 +00:00
parent f9372e9408
commit 4f34d57223
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Aug 13 20:13:48 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/qemu_driver.c: Use \r instead of \n for monitor commands to
avoid bug where QEMU \n gets translated to \r\n,then causing QEMU
to process the command twice. Patch from Jim Paris.
Mon Aug 13 11:55:48 CEST 2007 Daniel Veillard <veillard@redhat.com>
* src/qemu_driver.c: patch from Jim Paris removing memory leak

4
src/qemu_driver.c
View File

@ -1755,7 +1755,7 @@ static int qemudDomainSuspend(virDomainPtr dom) {
if (vm->state == VIR_DOMAIN_PAUSED)
return 0;
if (qemudMonitorCommand(driver, vm, "stop\n", &info) < 0) {
if (qemudMonitorCommand(driver, vm, "stop\r", &info) < 0) {
qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "suspend operation failed");
return -1;
}
@ -1780,7 +1780,7 @@ static int qemudDomainResume(virDomainPtr dom) {
}
if (vm->state == VIR_DOMAIN_RUNNING)
return 0;
if (qemudMonitorCommand(driver, vm, "cont\n", &info) < 0) {
if (qemudMonitorCommand(driver, vm, "cont\r", &info) < 0) {
qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "resume operation failed");
return -1;
}