From nobody Tue Nov 4 15:26:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530215999541782.0051830572658; Thu, 28 Jun 2018 12:59:59 -0700 (PDT) Received: from localhost ([::1]:38252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYd53-0003Ol-IS for importer@patchew.org; Thu, 28 Jun 2018 15:59:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYd36-0002DD-Ay for qemu-devel@nongnu.org; Thu, 28 Jun 2018 15:57:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYd33-0000SR-RI for qemu-devel@nongnu.org; Thu, 28 Jun 2018 15:57:48 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:50987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYd33-0000Qk-Ki for qemu-devel@nongnu.org; Thu, 28 Jun 2018 15:57:45 -0400 Received: by mail-wm0-x229.google.com with SMTP id e16-v6so10965341wmd.0 for ; Thu, 28 Jun 2018 12:57:45 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id d102-v6sm12516646wma.10.2018.06.28.12.57.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 12:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LEJpmGTR1sh04RSAdXZRZhe7n//wduG1WmzvBNmdzrg=; b=uuza2BrlzVrmW24nRHc1m6pE8GV23CMYbFNkezyfOMam+A12zC0iP0DmaJMCsV2n5A rj+X6rQh8RUBl0IwTY8g6/avK8SwNF+4MfOAIeXE57H0jrW179aKaz86DjY7JMZqvYwq gnaHmql84ICwhYdCkDF43lSroduCl6k/Cs9ta74IyDwWYd5Zf4vU3g3D3qlXd5rez3CP yuAp+Q0eMoh2bA9TQBDE6tjjBqLf/Uvbf3TGswbo5y0d8eo+/C7pJyuxd/LmUOS00XTy 0Q5k9IpDXAE9/i8zufkGe5cJiMW7WgpG3aSpxwe7HmxZTRudEeKKJAlOCeX5JGVU46vz 63gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LEJpmGTR1sh04RSAdXZRZhe7n//wduG1WmzvBNmdzrg=; b=dzFBRWEbGzzmYBw6UFo7MfJqfcR2/NipCCAk2jTR2/mcJO2idk9NC2Ljo3tqZ7mViC WRnJrRQMqI/Xbk0Y/kY6Y3Mf4AbsgZ92V5OuS6SMWkpPv3sCDC+X50XpxYRGerCLJbCv +IdBrPvhkTChG0/cWQleODkKbUuyrT7rSYUgl7yX6bAIUTyQVkSjgTDcLQ4dDeCg2M4f m4QodIn2/5pbbvMrcpr2cZmPyktpPQNkx8VLgPaB7bv/b9cDAXNVMlaRYG+RbPGRMPLJ Boh0DXCYXI8dgksHEWkz0OIXINOlgzCfTrwqEigWLzW5vZe/RDRz0XdVk3Inx868SOch YKSw== X-Gm-Message-State: APt69E1jpLi9hSXB3BT7C/fU4GgbL1nmg/z+H6jRmiVSc019jhlqj3uB Sz8lRuxbp9Z9KpkhEdteBPe37j96 X-Google-Smtp-Source: AAOMgpe6jSZsYvyQkdfCnR8b9MEbopobICUIpwHbswM/ZTPsZK1InWIhByNo0wSlua0rgdfFF8hCJw== X-Received: by 2002:a1c:d884:: with SMTP id p126-v6mr8747311wmg.110.1530215864238; Thu, 28 Jun 2018 12:57:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 21:57:33 +0200 Message-Id: <1530215858-1525-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530215858-1525-1-git-send-email-pbonzini@redhat.com> References: <1530215858-1525-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::229 Subject: [Qemu-devel] [PATCH 1/6] pr-helper: fix --socket-path default in help X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scsi/qemu-pr-helper.c | 15 ++++++++------- 1 file 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 =3D -1; static int gid =3D -1; #endif =20 +static void compute_default_paths(void) +{ + if (!socket_path) { + socket_path =3D 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(voi= d) return NULL; } =20 -static void compute_default_paths(void) -{ - if (!socket_path) { - socket_path =3D qemu_get_local_state_pathname("run/qemu-pr-helper.= sock"); - } -} - static void termsig_handler(int signum) { atomic_cmpxchg(&state, RUNNING, TERMINATE); --=20 1.8.3.1