From nobody Tue Feb 10 09:58:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1668061742; cv=none; d=zohomail.com; s=zohoarc; b=K8nEH8V4Fi5X6vcgga3IKa9dVNQLOOtfKt8poJxdXk4bjVwLWp+HYPfXA0EA7e/el8sLfhziaafkcLumj02rCFmaL5CDCtDFZTcZVwiJ2VOBv6YDPnOvtGRaW8LNEPkn1drICZJyavIvnlxS9JobeXvFUWM8Kw/ad0npRAAicbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668061742; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=imXo2IRrILpkxUDOjeir+V07IKls1TLJKB9c8zb1QFc=; b=ighbIYW6IQZvxF3EpmFfoNcynYZoZNNqENP70cwDywkalSbEeA8IO2WlON4vx7jdTK97WAVHYyOYDX+dg92uxDMy/CaseD8sBPvxqpQnFKrUF0Xfw7Ix8nIpf1WghdvisFJdOpYfn4JHqjGacjURQW93qQr/Bgt2LhzIzL4DiHM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1668061742493323.15618764915723; Wed, 9 Nov 2022 22:29:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ot10L-0001tL-Vc; Thu, 10 Nov 2022 01:25:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ot10K-0001pd-ET for qemu-devel@nongnu.org; Thu, 10 Nov 2022 01:25:36 -0500 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ot10I-0000K4-Pc for qemu-devel@nongnu.org; Thu, 10 Nov 2022 01:25:36 -0500 Received: by mail-pg1-x536.google.com with SMTP id v3so864967pgh.4 for ; Wed, 09 Nov 2022 22:25:34 -0800 (PST) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id m4-20020a17090ade0400b002108cabbe31sm2289003pjv.9.2022.11.09.22.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 22:25:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=imXo2IRrILpkxUDOjeir+V07IKls1TLJKB9c8zb1QFc=; b=vDkF5bL8SedL4u/8o+q2LoM2GA+YpMcjvsNQ9lUx7UUhm5ZR2Ezl52s+KhNoI1Bsdt 3Gx1jarUSeeUOuuXbLgD4yl5hD06grTo6QQuvzDIlzrv/nF5m5RO/WAGKeiwitNj4sJ+ 8Kf6VOnBcrEiufCS4B5l4fdMxyIG/8xW+6MnsSywYM6ww3sqGO77atU4lj5t0YVDZ+Il sngtwoWWxi92ngZJNr0HkacNPIGT6puDjcDldGTU2lyW/dOb6yQTHYOJDoTUNdwXvGIA VsMiAz21o++//2CpTgyk810Uy8kHNL83tWIF5cmYZqJJnOlnDgiNpA77U0eQ7VzBxUl3 gFww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=imXo2IRrILpkxUDOjeir+V07IKls1TLJKB9c8zb1QFc=; b=oAj5MWXt1/YuEC6A/K0dy+tmfO+ijSfFpbkeHlY9wqQYIkioEQIA/XjHWpWPGjXFqm B1t8MgoQCkncSw5LUHYR48kL9evsORn/DsybOaCG18iDSSV+U2/gPW2ZVTpEar2Pzhq7 LeUWYzRTGgbD9iny1Al7fmIuPsV6/g8iHQReLSBzc1I5sYwzUQ6uirwl5sJGxYR9wmjS eHpxI7OgZO70mTnv81FZ0hZNblqxfiDgowQCfQbjRV2Vkj+ZSZiKbFtCLKhKmmKC8gZX aoCDKhynL7AaDJjzuQTj5BiLfM0GBObv5iQ4UusciUZ/TtUSM7kOXfaMH9sCglASKdLO PuvQ== X-Gm-Message-State: ACrzQf1LIYl/iXs046wN4aGv/6Lize2CFTPDge5k/lrAKEavMwlghVVT I+68wIQltcdUj9VAYGJ7cNKdBXJQtJtKowJR X-Google-Smtp-Source: AMsMyM5iBA8Pow4hdHT7e8Nz4LEUjQRHsbnG2Rt/8n8r5YIO/jNr1Ty9U/uSBXD1SBVeG83VHtRwFw== X-Received: by 2002:a62:32c2:0:b0:56b:2cce:d46a with SMTP id y185-20020a6232c2000000b0056b2cced46amr63063500pfy.36.1668061533157; Wed, 09 Nov 2022 22:25:33 -0800 (PST) From: Akihiko Odaki To: Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, virtio-fs@redhat.com, Yuval Shaia , Marcel Apfelbaum , Konstantin Kostiuk , Michael Roth , Paolo Bonzini , Fam Zheng , "Dr. David Alan Gilbert" , Stefan Hajnoczi , Gerd Hoffmann , Stefan Weil , Yan Vugenfirer , Akihiko Odaki Subject: [PATCH 03/10] ivshmem-server: Use qemu_get_runtime_dir() Date: Thu, 10 Nov 2022 15:23:22 +0900 Message-Id: <20221110062329.13363-4-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221110062329.13363-1-akihiko.odaki@daynix.com> References: <20221110062329.13363-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::536; envelope-from=akihiko.odaki@daynix.com; helo=mail-pg1-x536.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1668061744087100003 Content-Type: text/plain; charset="utf-8" qemu_get_runtime_dir() is used to construct the default PID file path. Signed-off-by: Akihiko Odaki --- contrib/ivshmem-server/main.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c index 224dbeb547..16abbe2f5a 100644 --- a/contrib/ivshmem-server/main.c +++ b/contrib/ivshmem-server/main.c @@ -14,7 +14,6 @@ =20 #define IVSHMEM_SERVER_DEFAULT_VERBOSE 0 #define IVSHMEM_SERVER_DEFAULT_FOREGROUND 0 -#define IVSHMEM_SERVER_DEFAULT_PID_FILE "/var/run/ivshmem-server.pid" #define IVSHMEM_SERVER_DEFAULT_UNIX_SOCK_PATH "/tmp/ivshmem_socket" #define IVSHMEM_SERVER_DEFAULT_SHM_PATH "ivshmem" #define IVSHMEM_SERVER_DEFAULT_SHM_SIZE (4 * 1024 * 1024) @@ -35,15 +34,23 @@ typedef struct IvshmemServerArgs { unsigned n_vectors; } IvshmemServerArgs; =20 +static char *ivshmem_server_get_default_pid_file(void) +{ + g_autofree char *run =3D qemu_get_runtime_dir(); + return g_build_filename(run, "ivshmem-server.pid", NULL); +} + static void ivshmem_server_usage(const char *progname) { + g_autofree char *pid_file =3D ivshmem_server_get_default_pid_file(); + printf("Usage: %s [OPTION]...\n" " -h: show this help\n" " -v: verbose mode\n" " -F: foreground mode (default is to daemonize)\n" " -p : path to the PID file (used in daemon mode onl= y)\n" - " default " IVSHMEM_SERVER_DEFAULT_PID_FILE "\n" + " default %s\n" " -S : path to the unix socket to listen to\= n" " default " IVSHMEM_SERVER_DEFAULT_UNIX_SOCK_PATH "\n" " -M : POSIX shared memory object to use\n" @@ -54,7 +61,7 @@ ivshmem_server_usage(const char *progname) " default %u\n" " -n : number of vectors\n" " default %u\n", - progname, IVSHMEM_SERVER_DEFAULT_SHM_SIZE, + progname, pid_file, IVSHMEM_SERVER_DEFAULT_SHM_SIZE, IVSHMEM_SERVER_DEFAULT_N_VECTORS); } =20 @@ -189,10 +196,10 @@ main(int argc, char *argv[]) { IvshmemServer server; struct sigaction sa, sa_quit; + g_autofree char *default_pid_file =3D NULL; IvshmemServerArgs args =3D { .verbose =3D IVSHMEM_SERVER_DEFAULT_VERBOSE, .foreground =3D IVSHMEM_SERVER_DEFAULT_FOREGROUND, - .pid_file =3D IVSHMEM_SERVER_DEFAULT_PID_FILE, .unix_socket_path =3D IVSHMEM_SERVER_DEFAULT_UNIX_SOCK_PATH, .shm_path =3D IVSHMEM_SERVER_DEFAULT_SHM_PATH, .use_shm_open =3D true, @@ -207,6 +214,11 @@ main(int argc, char *argv[]) */ printf("*** Example code, do not use in production ***\n"); =20 + qemu_init_exec_dir(argv[0]); + + default_pid_file =3D ivshmem_server_get_default_pid_file(); + args.pid_file =3D default_pid_file; + /* parse arguments, will exit on error */ ivshmem_server_parse_args(&args, argc, argv); =20 --=20 2.38.1