Message ID | 1530216310-52873-33-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pmghTR3N"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Grxd6g9qz9ryk for <incoming@patchwork.ozlabs.org>; Fri, 29 Jun 2018 06:30:13 +1000 (AEST) Received: from localhost ([::1]:38409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fYdYR-0002Q4-HT for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2018 16:30:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fYdAp-0007RC-9Y for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fYdAo-0000mx-FC for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:47 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:46660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fYdAo-0000lb-8u for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:46 -0400 Received: by mail-wr0-x243.google.com with SMTP id t6-v6so6665863wrq.13 for <qemu-devel@nongnu.org>; Thu, 28 Jun 2018 13:05:46 -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=pmghTR3NdlMvs0XgCem5jUVjHJOlVaR7q8FGHyQHYZBdVTAoqHTLQUiUlfckjJLA/G 4ZmQ+voUMTu9O1cDBadQoT09GL/pjh/rCI0xXPUaRnkEOzDg4coWV/Gio/C4U/r9s6YU IXJ2jywM7IFx3LGELm5U9y/LfXmy2E8suxaCLGQvuLyeCXXxkS7WfrJ3aPW/ux14lGXr aHAULnExWhjsWCcsOWscPi4Q4x/GX+qM+gsvwVpOqBKdeTiYOfVLynJXBlc2tMLduUxE kozaZeI+ZqhWdHcaUrWYALt3mxvz1oLx1gvPMDcoU0uzOBbDC1aEv6j3HPmgjoebIje5 Yjlg== 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=ALucBT07cSFJj9QiUM5Mj//l85isOO2TMdocE+0bIRsjcWz6oJcuhoohfDbkZzdsFl ldwoWdiXDY83Lhjy6STTw8c1yue/nzA//M2o/HRucTQMXHTIgiWNrN35A6rVoUN230MB sW34mBuyx1OSXakvQBpTfQApVGbjlXecMxKVRiOLdF7vd57Gbq4NWgWaOjIWZdjc1e+L F9sDd0GUeg4OXw42gxp6sI7c6y1DRFoKjpRTPd8E/5IGOwc4GyDrF9ZWYSBlUKaZ3HA0 rOECxeseiut4dAVzvD99KD+FE2SH5Dto2wnqLk6wmmbYwzkPkrdmGdhK4N+qOfnngwQ5 LFFw== X-Gm-Message-State: APt69E0pHjV8vAYH1VPqOlU698KONIghrBpxo+u2+yeVzBroB1hs3tuE a/CqM9XhgrVqde7PLwwi3ADkGa5Q X-Google-Smtp-Source: AAOMgpcshmBAB6domDX6ckZM0d9ZqTwAIK3SRq5/Q7V/RWlaPKSIRT8E/pdZtj1PWP8jaKEMDluNYw== X-Received: by 2002:adf:c377:: with SMTP id e52-v6mr9514204wrg.257.1530216345026; Thu, 28 Jun 2018 13:05:45 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 127-v6sm6211110wmd.18.2018.06.28.13.05.44 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:05:44 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 22:04:42 +0200 Message-Id: <1530216310-52873-33-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> References: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 32/60] pr-helper: fix --socket-path default in help X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/60] exec: Fix MAP_RAM for cached access
|
expand
|
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);