From 4f34d57223974073c9378b1ee59df4c53e10695f Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 14 Aug 2007 00:15:16 +0000 Subject: [PATCH] Use \r instead of \n for QEMU monitor --- ChangeLog | 6 ++++++ src/qemu_driver.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f41622805..f27bb64733 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Aug 13 20:13:48 EST 2007 Daniel P. Berrange + + * 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 * src/qemu_driver.c: patch from Jim Paris removing memory leak diff --git a/src/qemu_driver.c b/src/qemu_driver.c index b05c3f66d9..e13e6a3a0e 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -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; } -- GitLab