[35/41] util: simplify write in signal handler

Commit Message

Marc-André Lureau April 20, 2022, 1:26 p.m. UTC

From: Marc-André Lureau <[e-mail]>

Use qemu_write_full() instead of open-coding a write loop.

Signed-off-by: Marc-André Lureau <[e-mail]>
---
 util/compatfd.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

Comments

Daniel P. Berrangé April 20, 2022, 3:49 p.m. UTC | #1

On Wed, Apr 20, 2022 at 05:26:18PM +0400, [e-mail] wrote:
> From: Marc-André Lureau <[e-mail]>
> 
> Use qemu_write_full() instead of open-coding a write loop.
> 
> Signed-off-by: Marc-André Lureau <[e-mail]>
> ---
>  util/compatfd.c | 18 ++----------------
>  1 file changed, 2 insertions(+), 16 deletions(-)

Reviewed-by: Daniel P. Berrangé <[e-mail]>


With regards,
Daniel

Patch

diff --git a/util/compatfd.c b/util/compatfd.c
index ab810c42a927..55b6e0b7fb27 100644
--- a/util/compatfd.c
+++ b/util/compatfd.c
@@ -42,25 +42,11 @@  static void *sigwait_compat(void *opaque)
             }
         } else {
             struct qemu_signalfd_siginfo buffer;
-            size_t offset = 0;
-
             memset(&buffer, 0, sizeof(buffer));
             buffer.ssi_signo = sig;
 
-            while (offset < sizeof(buffer)) {
-                ssize_t len;
-
-                len = write(info->fd, (char *)&buffer + offset,
-                            sizeof(buffer) - offset);
-                if (len == -1 && errno == EINTR) {
-                    continue;
-                }
-
-                if (len <= 0) {
-                    return NULL;
-                }
-
-                offset += len;
+            if (qemu_write_full(info->fd, &buffer, sizeof(buffer)) != sizeof(buffer)) {
+                return NULL;
             }
         }
     }