External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert QEMU driver to use virLogProbablyLogMessage

Browse Source 
The current QEMU code for skipping log messages only skips over
'debug' message, switch to virLogProbablyLogMessage to make sure
it skips over all of them
This commit is contained in:
Daniel P. Berrange 2013-03-04 20:50:42 +00:00
parent 09f5e0123f
commit 82793a2a55
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_process.c
View File

@ -1434,19 +1434,11 @@ qemuProcessReadLogOutput(virDomainObjPtr vm,
{
int retries = (timeout*10);
int got = 0;
char *debug = NULL;
int ret = -1;
char *filter_next = buf;
buf[0] = '\0';
/* This relies on log message format generated by virLogFormatString() and
* might need to be modified when message format changes. */
if (virAsprintf(&debug, ": %d: debug : ", vm->pid) < 0) {
virReportOOMError();
return -1;
}
while (retries) {
ssize_t func_ret, bytes;
int isdead = 0;
@ -1473,7 +1465,7 @@ qemuProcessReadLogOutput(virDomainObjPtr vm,
/* Filter out debug messages from intermediate libvirt process */
while ((eol = strchr(filter_next, '\n'))) {
*eol = '\0';
if (strstr(filter_next, debug)) {
if (virLogProbablyLogMessage(filter_next)) {
memmove(filter_next, eol + 1, got - (eol - buf));
got -= eol + 1 - filter_next;
} else {
@ -1510,7 +1502,6 @@ qemuProcessReadLogOutput(virDomainObjPtr vm,
what, buf);
cleanup:
VIR_FREE(debug);
return ret;
}