cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-virtiofsd-convert-more-fprintf-and-perror-to-use-fus.patch

902636
From e00543b0384fba61a9c7274c73e11a25e7ab2946 Mon Sep 17 00:00:00 2001
902636
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
902636
Date: Mon, 27 Jan 2020 19:02:13 +0100
902636
Subject: [PATCH 102/116] virtiofsd: convert more fprintf and perror to use
902636
 fuse log infra
902636
MIME-Version: 1.0
902636
Content-Type: text/plain; charset=UTF-8
902636
Content-Transfer-Encoding: 8bit
902636
902636
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
Message-id: <20200127190227.40942-99-dgilbert@redhat.com>
902636
Patchwork-id: 93552
902636
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 098/112] virtiofsd: convert more fprintf and perror to use fuse log infra
902636
Bugzilla: 1694164
902636
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
902636
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
902636
902636
From: Eryu Guan <eguan@linux.alibaba.com>
902636
902636
Signed-off-by: Eryu Guan <eguan@linux.alibaba.com>
902636
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
902636
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
902636
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
902636
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
(cherry picked from commit fc1aed0bf96259d0b46b1cfea7497b7762c4ee3d)
902636
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
902636
---
902636
 tools/virtiofsd/fuse_signals.c | 7 +++++--
902636
 tools/virtiofsd/helper.c       | 9 ++++++---
902636
 2 files changed, 11 insertions(+), 5 deletions(-)
902636
902636
diff --git a/tools/virtiofsd/fuse_signals.c b/tools/virtiofsd/fuse_signals.c
902636
index dc7c8ac..f18625b 100644
902636
--- a/tools/virtiofsd/fuse_signals.c
902636
+++ b/tools/virtiofsd/fuse_signals.c
902636
@@ -12,6 +12,7 @@
902636
 #include "fuse_i.h"
902636
 #include "fuse_lowlevel.h"
902636
 
902636
+#include <errno.h>
902636
 #include <signal.h>
902636
 #include <stdio.h>
902636
 #include <stdlib.h>
902636
@@ -47,13 +48,15 @@ static int set_one_signal_handler(int sig, void (*handler)(int), int remove)
902636
     sa.sa_flags = 0;
902636
 
902636
     if (sigaction(sig, NULL, &old_sa) == -1) {
902636
-        perror("fuse: cannot get old signal handler");
902636
+        fuse_log(FUSE_LOG_ERR, "fuse: cannot get old signal handler: %s\n",
902636
+                 strerror(errno));
902636
         return -1;
902636
     }
902636
 
902636
     if (old_sa.sa_handler == (remove ? handler : SIG_DFL) &&
902636
         sigaction(sig, &sa, NULL) == -1) {
902636
-        perror("fuse: cannot set signal handler");
902636
+        fuse_log(FUSE_LOG_ERR, "fuse: cannot set signal handler: %s\n",
902636
+                 strerror(errno));
902636
         return -1;
902636
     }
902636
     return 0;
902636
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
902636
index 33749bf..f98d8f2 100644
902636
--- a/tools/virtiofsd/helper.c
902636
+++ b/tools/virtiofsd/helper.c
902636
@@ -208,7 +208,8 @@ int fuse_daemonize(int foreground)
902636
         char completed;
902636
 
902636
         if (pipe(waiter)) {
902636
-            perror("fuse_daemonize: pipe");
902636
+            fuse_log(FUSE_LOG_ERR, "fuse_daemonize: pipe: %s\n",
902636
+                     strerror(errno));
902636
             return -1;
902636
         }
902636
 
902636
@@ -218,7 +219,8 @@ int fuse_daemonize(int foreground)
902636
          */
902636
         switch (fork()) {
902636
         case -1:
902636
-            perror("fuse_daemonize: fork");
902636
+            fuse_log(FUSE_LOG_ERR, "fuse_daemonize: fork: %s\n",
902636
+                     strerror(errno));
902636
             return -1;
902636
         case 0:
902636
             break;
902636
@@ -228,7 +230,8 @@ int fuse_daemonize(int foreground)
902636
         }
902636
 
902636
         if (setsid() == -1) {
902636
-            perror("fuse_daemonize: setsid");
902636
+            fuse_log(FUSE_LOG_ERR, "fuse_daemonize: setsid: %s\n",
902636
+                     strerror(errno));
902636
             return -1;
902636
         }
902636
 
902636
-- 
902636
1.8.3.1
902636