|
 |
1bdc94 |
From ba4e622bc5d07daba8a63589124c944d6105e054 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 6 Jul 2018 17:56:51 +0200
|
|
|
1bdc94 |
Subject: [PATCH 17/89] pr-helper: fix --socket-path default in help
|
|
|
1bdc94 |
MIME-Version: 1.0
|
|
|
1bdc94 |
Content-Type: text/plain; charset=UTF-8
|
|
|
1bdc94 |
Content-Transfer-Encoding: 8bit
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180706175659.30615-2-pbonzini@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81244
|
|
|
1bdc94 |
O-Subject: [RHEL7.6 qemu-kvm-rhev PATCH 1/9] pr-helper: fix --socket-path default in help
|
|
|
1bdc94 |
Bugzilla: 1533158
|
|
|
1bdc94 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Currently --help shows "(default '(null)')" for the -k/--socket-path
|
|
|
1bdc94 |
option. Fix it by getting the default path in /var/run.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
|
1bdc94 |
(cherry picked from commit 50fa332516d5e42695811f43396b749185e21b9c)
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
scsi/qemu-pr-helper.c | 15 ++++++++-------
|
|
|
1bdc94 |
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
|
|
|
1bdc94 |
index 7a29e64..19887f5 100644
|
|
|
1bdc94 |
--- a/scsi/qemu-pr-helper.c
|
|
|
1bdc94 |
+++ b/scsi/qemu-pr-helper.c
|
|
|
1bdc94 |
@@ -74,8 +74,16 @@ static int uid = -1;
|
|
|
1bdc94 |
static int gid = -1;
|
|
|
1bdc94 |
#endif
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+static void compute_default_paths(void)
|
|
|
1bdc94 |
+{
|
|
|
1bdc94 |
+ if (!socket_path) {
|
|
|
1bdc94 |
+ socket_path = qemu_get_local_state_pathname("run/qemu-pr-helper.sock");
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
+}
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
static void usage(const char *name)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
+ compute_default_paths();
|
|
|
1bdc94 |
(printf) (
|
|
|
1bdc94 |
"Usage: %s [OPTIONS] FILE\n"
|
|
|
1bdc94 |
"Persistent Reservation helper program for QEMU\n"
|
|
|
1bdc94 |
@@ -834,13 +842,6 @@ static const char *socket_activation_validate_opts(void)
|
|
|
1bdc94 |
return NULL;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
-static void compute_default_paths(void)
|
|
|
1bdc94 |
-{
|
|
|
1bdc94 |
- if (!socket_path) {
|
|
|
1bdc94 |
- socket_path = qemu_get_local_state_pathname("run/qemu-pr-helper.sock");
|
|
|
1bdc94 |
- }
|
|
|
1bdc94 |
-}
|
|
|
1bdc94 |
-
|
|
|
1bdc94 |
static void termsig_handler(int signum)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
atomic_cmpxchg(&state, RUNNING, TERMINATE);
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|