From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Thu, 24 Sep 2020 12:54:24 +0000 (+0300)
Subject: logging: fix endless loop on EOF
X-Git-Tag: v6.9.0-rc1~410
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bde9e2c6c018f79d8e3b0bd30ea7aa80dcc9e435;p=thirdparty%2Flibvirt.git

logging: fix endless loop on EOF

On EOF condition we always have POLLHUP event and read returns
0 thus we never break loop in virLogHandlerDomainLogFileDrain.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
index 6f5277c679..95d909b44e 100644
--- a/src/logging/log_handler.c
+++ b/src/logging/log_handler.c
@@ -461,6 +461,8 @@ virLogHandlerDomainLogFileDrain(virLogHandlerLogFilePtr file)
             if (errno == EINTR)
                 continue;
             return;
+        } else if (len == 0) {
+            return;
         }
 
         if (virRotatingFileWriterAppend(file->file, buf, len) != len)