aboutsummaryrefslogtreecommitdiff
path: root/scsi
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2018-06-26 13:55:04 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2018-06-28 19:05:34 +0200
commit50fa332516d5e42695811f43396b749185e21b9c (patch)
tree0daf1b459cea22b168de8602f1944802510e0cd4 /scsi
parentc44df2ff9be326b218f6655ee17ddd914ece8d5a (diff)
downloadqemu-50fa332516d5e42695811f43396b749185e21b9c.zip
qemu-50fa332516d5e42695811f43396b749185e21b9c.tar.gz
qemu-50fa332516d5e42695811f43396b749185e21b9c.tar.bz2
pr-helper: fix --socket-path default in help
Currently --help shows "(default '(null)')" for the -k/--socket-path option. Fix it by getting the default path in /var/run. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'scsi')
-rw-r--r--scsi/qemu-pr-helper.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index d0f8317..4057cf3 100644
--- a/scsi/qemu-pr-helper.c
+++ b/scsi/qemu-pr-helper.c
@@ -74,8 +74,16 @@ static int uid = -1;
static int gid = -1;
#endif
+static void compute_default_paths(void)
+{
+ if (!socket_path) {
+ socket_path = qemu_get_local_state_pathname("run/qemu-pr-helper.sock");
+ }
+}
+
static void usage(const char *name)
{
+ compute_default_paths();
(printf) (
"Usage: %s [OPTIONS] FILE\n"
"Persistent Reservation helper program for QEMU\n"
@@ -845,13 +853,6 @@ static const char *socket_activation_validate_opts(void)
return NULL;
}
-static void compute_default_paths(void)
-{
- if (!socket_path) {
- socket_path = qemu_get_local_state_pathname("run/qemu-pr-helper.sock");
- }
-}
-
static void termsig_handler(int signum)
{
atomic_cmpxchg(&state, RUNNING, TERMINATE);