From nobody Tue Nov 4 21:57:04 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 153089777216748.388512829743604; Fri, 6 Jul 2018 10:22:52 -0700 (PDT) Received: from localhost ([::1]:59038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbURX-0006tz-BH for importer@patchew.org; Fri, 06 Jul 2018 13:22:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fbUK4-0001D5-6q for qemu-devel@nongnu.org; Fri, 06 Jul 2018 13:15:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fbUK0-0000lF-PP for qemu-devel@nongnu.org; Fri, 06 Jul 2018 13:15:08 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33779) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fbUK0-0000kv-HF for qemu-devel@nongnu.org; Fri, 06 Jul 2018 13:15:04 -0400 Received: by mail-wr1-x444.google.com with SMTP id k7-v6so4865155wrq.0 for ; Fri, 06 Jul 2018 10:15:04 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id h40-v6sm13784683wrf.40.2018.07.06.10.15.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jul 2018 10:15:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=dkYxrUNZg+LvvaoTjlrZ8AaE2tjNq6W7FbTBUc0UKAM=; b=QsnpmVH5//1u79yyl5o9C3dF+Ah0McLs27SXhlHT11D5cgFj52e6VAZWyqcWOG8wOZ QEWtLc3Z1QrC8xKI1pooKdgtdaq6PU97LcdzoXyzTEdIhARszfg+vcwqBuF6QMUvB11x 4w8c94X8HsVGFWC1Lfnrejsn7bHjnDKhdQcI8Yj3CbrPQhG6cOWztJxDdDBQrfSk4syw 0OXY2moLTkdWgmKa607iE2lz79z4fp//Rf2J3uuZSCm37ziLYHRe5Oosk/h0tZgzaa2g kEdh2ae2RktuJ0aQ3Dn8jwVQQx0n9FhfUc+NS9zZRtbSkfOuPh0z/hZEHm6zhMkejj7X OLdQ== 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:cc:subject:date:message-id :in-reply-to:references; bh=dkYxrUNZg+LvvaoTjlrZ8AaE2tjNq6W7FbTBUc0UKAM=; b=GWw3SgGk0i/XYSjt77xrVRJzRRHjgf2EaE24MUpeeEj4fhN1M7UbARz/N4aGIL/LTi XE8w/Pl+fZBBh8ecw7LkCoP9+SbgAUb9qO75hIGHi0Un/V+ph+3L9Eyyp19vN4gBgcko 9f9+FXdaoLkNgnuWPeTX8Z81TD4rMG6tT5hc16RiZzI7oTr6YozGzHKw+i4x/kM6nsAo 7GnMuG6hSI6VqCaM6PmIPlipUbCr1wFYQbgur3pvNv4ERUSun1JL6VJMKm6qExcJ4OxF 0vJxz/eBJpt/2lqKkOz5k0hawvRTk4dBvCjVPp/ii0pvIGjtylB4rit4uVs6lsHY6J3d ZexQ== X-Gm-Message-State: APt69E1w+RH1J/pqbXE8hJ8AXlslHH1OuNtKp50+EvM81W5nXtCTpUhT /+aXxF6mf9Cy21ARYrkpfxvlwzIi X-Google-Smtp-Source: AAOMgpfnnWebo2RvvekpemZE98Cp7OYITINUwMETuFKWjB8kyXOseDlAE4p9XbSMfgQDHHOo2HZ9Qw== X-Received: by 2002:adf:b3d4:: with SMTP id x20-v6mr8459388wrd.272.1530897303311; Fri, 06 Jul 2018 10:15:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 6 Jul 2018 19:14:22 +0200 Message-Id: <1530897268-22932-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530897268-22932-1-git-send-email-pbonzini@redhat.com> References: <1530897268-22932-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PULL 2/8] pr-helper: Rework socket path handling 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: , Cc: Michal Privoznik 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Michal Privoznik When reviewing Paolo's pr-helper patches I've noticed couple of problems: 1) socket_path needs to be calculated at two different places (one for printing out help, the other if socket activation is NOT used), 2) even though the default socket_path is allocated in compute_default_paths() it is the only default path the function handles. For instance, pidfile is allocated outside of this function. And yet again, at different places than 1) Signed-off-by: Michal Privoznik Message-Id: Signed-off-by: Paolo Bonzini --- scsi/qemu-pr-helper.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c index c89a446..1528a71 100644 --- a/scsi/qemu-pr-helper.c +++ b/scsi/qemu-pr-helper.c @@ -76,14 +76,12 @@ static int gid =3D -1; =20 static void compute_default_paths(void) { - if (!socket_path) { - socket_path =3D qemu_get_local_state_pathname("run/qemu-pr-helper.= sock"); - } + socket_path =3D qemu_get_local_state_pathname("run/qemu-pr-helper.sock= "); + pidfile =3D qemu_get_local_state_pathname("run/qemu-pr-helper.pid"); } =20 static void usage(const char *name) { - compute_default_paths(); (printf) ( "Usage: %s [OPTIONS] FILE\n" "Persistent Reservation helper program for QEMU\n" @@ -841,19 +839,6 @@ static gboolean accept_client(QIOChannel *ioc, GIOCond= ition cond, gpointer opaqu return TRUE; } =20 - -/* - * Check socket parameters compatibility when socket activation is used. - */ -static const char *socket_activation_validate_opts(void) -{ - if (socket_path !=3D NULL) { - return "Unix socket can't be set when using socket activation"; - } - - return NULL; -} - static void termsig_handler(int signum) { atomic_cmpxchg(&state, RUNNING, TERMINATE); @@ -927,6 +912,7 @@ int main(int argc, char **argv) char *trace_file =3D NULL; bool daemonize =3D false; bool pidfile_specified =3D false; + bool socket_path_specified =3D false; unsigned socket_activation; =20 struct sigaction sa_sigterm; @@ -943,12 +929,14 @@ int main(int argc, char **argv) qemu_add_opts(&qemu_trace_opts); qemu_init_exec_dir(argv[0]); =20 - pidfile =3D qemu_get_local_state_pathname("run/qemu-pr-helper.pid"); + compute_default_paths(); =20 while ((ch =3D getopt_long(argc, argv, sopt, lopt, &opt_ind)) !=3D -1)= { switch (ch) { case 'k': - socket_path =3D optarg; + g_free(socket_path); + socket_path =3D g_strdup(optarg); + socket_path_specified =3D true; if (socket_path[0] !=3D '/') { error_report("socket path must be absolute"); exit(EXIT_FAILURE); @@ -1039,10 +1027,9 @@ int main(int argc, char **argv) socket_activation =3D check_socket_activation(); if (socket_activation =3D=3D 0) { SocketAddress saddr; - compute_default_paths(); saddr =3D (SocketAddress){ .type =3D SOCKET_ADDRESS_TYPE_UNIX, - .u.q_unix.path =3D g_strdup(socket_path) + .u.q_unix.path =3D socket_path, }; server_ioc =3D qio_channel_socket_new(); if (qio_channel_socket_listen_sync(server_ioc, &saddr, &local_err)= < 0) { @@ -1050,12 +1037,10 @@ int main(int argc, char **argv) error_report_err(local_err); return 1; } - g_free(saddr.u.q_unix.path); } else { /* Using socket activation - check user didn't use -p etc. */ - const char *err_msg =3D socket_activation_validate_opts(); - if (err_msg !=3D NULL) { - error_report("%s", err_msg); + if (socket_path_specified) { + error_report("Unix socket can't be set when using socket activ= ation"); exit(EXIT_FAILURE); } =20 @@ -1072,7 +1057,6 @@ int main(int argc, char **argv) error_get_pretty(local_err)); exit(EXIT_FAILURE); } - socket_path =3D NULL; } =20 if (qemu_init_main_loop(&local_err)) { --=20 1.8.3.1