]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Properly skip "char device redirected to" in QEMU log
authorJiri Denemark <jdenemar@redhat.com>
Wed, 22 Nov 2017 09:19:12 +0000 (10:19 +0100)
committerJiri Denemark <jdenemar@redhat.com>
Thu, 23 Nov 2017 13:06:40 +0000 (14:06 +0100)
When reading QEMU log for reporting it as an error message, we want to
skip "char device redirected to" line. However, this string is not
printed at the beginning of a line, which means STRPREFIX will never
find it.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
src/qemu/qemu_process.c

index 6d242b1b51aa2c963fc5ae91587c931926827aed..3da297c16f07b383a276dd83dbee29b367d98e4b 100644 (file)
@@ -1847,7 +1847,7 @@ qemuProcessReadLog(qemuDomainLogContextPtr logCtxt, char **msg)
     while ((eol = strchr(filter_next, '\n'))) {
         *eol = '\0';
         if (virLogProbablyLogMessage(filter_next) ||
-            STRPREFIX(filter_next, "char device redirected to")) {
+            strstr(filter_next, "char device redirected to")) {
             size_t skip = (eol + 1) - filter_next;
             memmove(filter_next, eol + 1, buf + got - eol);
             got -= skip;