External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make qemudMonitorCommand append line endings

Browse Source
This commit is contained in:
Daniel P. Berrange 2007-10-27 01:16:53 +00:00
parent 2718513226
commit 79995893de
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Oct 26 21:10:44 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/qemu_driver.c: make qemudMonitorCommand responsible for
adding appropriate line ending instead of the caller
Fri Oct 26 15:40:44 CEST 2007 Daniel Veillard <veillard@redhat.com> Fri Oct 26 15:40:44 CEST 2007 Daniel Veillard <veillard@redhat.com>
* src/xml.c: fix build when configured without Xen * src/xml.c: fix build when configured without Xen

57
src/qemu_driver.c
View File

@ -1311,10 +1311,12 @@ static int qemudMonitorCommand(struct qemud_driver *driver ATTRIBUTE_UNUSED,
char **reply) { char **reply) {
int size = 0; int size = 0;
char *buf = NULL; char *buf = NULL;
size_t cmdlen = strlen(cmd);
if (write(vm->monitor, cmd, strlen(cmd)) < 0) { if (safewrite(vm->monitor, cmd, cmdlen) != cmdlen)
return -1;
if (safewrite(vm->monitor, "\r", 1) != 1)
return -1; return -1;
}
*reply = NULL; *reply = NULL;
@ -1328,32 +1330,24 @@ static int qemudMonitorCommand(struct qemud_driver *driver ATTRIBUTE_UNUSED,
int got = read(vm->monitor, data, sizeof(data)); int got = read(vm->monitor, data, sizeof(data));
char *b; char *b;
if (got == 0) { if (got == 0)
if (buf) goto error;
free(buf);
return -1;
}
if (got < 0) { if (got < 0) {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
if (errno == EAGAIN) if (errno == EAGAIN)
break; break;
goto error;
}
if (!(b = realloc(buf, size+got+1)))
goto error;
if (buf)
free(buf);
return -1;
}
if (!(b = realloc(buf, size+got+1))) {
free(buf);
return -1;
}
buf = b; buf = b;
memmove(buf+size, data, got); memmove(buf+size, data, got);
buf[size+got] = '\0'; buf[size+got] = '\0';
size += got; size += got;
} }
if (buf)
qemudDebug("Mon [%s]", buf);
/* Look for QEMU prompt to indicate completion */ /* Look for QEMU prompt to indicate completion */
if (buf && ((tmp = strstr(buf, "\n(qemu) ")) != NULL)) { if (buf && ((tmp = strstr(buf, "\n(qemu) ")) != NULL)) {
tmp[0] = '\0'; tmp[0] = '\0';
@ -1364,14 +1358,27 @@ static int qemudMonitorCommand(struct qemud_driver *driver ATTRIBUTE_UNUSED,
if (poll(&fd, 1, -1) < 0) { if (poll(&fd, 1, -1) < 0) {
if (errno == EINTR) if (errno == EINTR)
goto pollagain; goto pollagain;
goto error;
}
}
free(buf); /* Log, but ignore failures to write logfile for VM */
return -1; if (safewrite(vm->logfile, buf, strlen(buf)) < 0)
} qemudLog(QEMUD_WARN, "Unable to log VM console data: %s",
} strerror(errno));
*reply = buf; *reply = buf;
return 0; return 0;
error:
if (buf) {
/* Log, but ignore failures to write logfile for VM */
if (safewrite(vm->logfile, buf, strlen(buf)) < 0)
qemudLog(QEMUD_WARN, "Unable to log VM console data: %s",
strerror(errno));
free(buf);
}
return -1;
} }
@ -1806,7 +1813,7 @@ static int qemudDomainSuspend(virDomainPtr dom) {
if (vm->state == VIR_DOMAIN_PAUSED) if (vm->state == VIR_DOMAIN_PAUSED)
return 0; return 0;
if (qemudMonitorCommand(driver, vm, "stop\r", &info) < 0) { if (qemudMonitorCommand(driver, vm, "stop", &info) < 0) {
qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "suspend operation failed"); qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "suspend operation failed");
return -1; return -1;
} }
@ -1831,7 +1838,7 @@ static int qemudDomainResume(virDomainPtr dom) {
} }
if (vm->state == VIR_DOMAIN_RUNNING) if (vm->state == VIR_DOMAIN_RUNNING)
return 0; return 0;
if (qemudMonitorCommand(driver, vm, "cont\r", &info) < 0) { if (qemudMonitorCommand(driver, vm, "cont", &info) < 0) {
qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "resume operation failed"); qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "resume operation failed");
return -1; return -1;
} }
@ -2063,7 +2070,7 @@ static int qemudDomainSave(virDomainPtr dom,
} }
if (asprintf (&command, "migrate \"exec:" if (asprintf (&command, "migrate \"exec:"
"dd of='%s' oflag=append conv=notrunc 2>/dev/null" "dd of='%s' oflag=append conv=notrunc 2>/dev/null"
"\"\r", safe_path) == -1) { "\"", safe_path) == -1) {
qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
"out of memory"); "out of memory");
free(safe_path); free(safe_path);
@ -2190,7 +2197,7 @@ static int qemudDomainRestore(virConnectPtr conn,
/* If it was running before, resume it now. */ /* If it was running before, resume it now. */
if (header.was_running) { if (header.was_running) {
char *info; char *info;
if (qemudMonitorCommand(driver, vm, "cont\r", &info) < 0) { if (qemudMonitorCommand(driver, vm, "cont", &info) < 0) {
qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED, qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
"failed to resume domain"); "failed to resume domain");
return -1; return -1;