From patchwork Thu Sep 21 07:54:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1837530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=cW9KHB8S; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RrnlG0njtz1ynF for ; Thu, 21 Sep 2023 17:55:54 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjEWO-0004V1-W8; Thu, 21 Sep 2023 03:54:49 -0400 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 1qjEWO-0004Ut-Al for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:54:48 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjEWL-0001MR-JH for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:54:48 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1c5dd017b30so179655ad.0 for ; Thu, 21 Sep 2023 00:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1695282884; x=1695887684; darn=nongnu.org; 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=uI/Kp4K+XtqHxtYAeT48aX1q/ar4g9aCgFPx0CsLxbY=; b=cW9KHB8SyXNfc5DwuMgqjEaCxWtM8lB6Fw2CBy6f0d4EkXVA7UxDrNY44H2xflonKi QLbnEnPqxVV1cdejdTo+IV3E1bxcbcWqsw3cYu8KJq+egoqpTrdEoA8TBaZz0G14JuwW Idw4duARI2qnbhZGSHZ46xYPqrzXVA2I3PQn6G+I99bamMGavlaATCbD3/2coweRCLGa Io4YjpZyu9leTA6cEJEh++N4jPuKZ12FaOGPQYL/9VKtiaDTgCRKBt8xtFS3QdXZSMA6 BbRmTYVfd785B/Op1QljtcLnHKJWX9DWkkGuLuafG4rxikJQc4uMNbmb8c3Gg6v9NYdQ 1S1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695282884; x=1695887684; 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=uI/Kp4K+XtqHxtYAeT48aX1q/ar4g9aCgFPx0CsLxbY=; b=V5k8a9RGoSwDU9YhI76SxmIYA38+DEIv0fAC1+8Ml66reT9apIu0PsqWULQUbNck9D 48VKuqYl8UgfOhC9pVlGdlzWlWqOAJpFB6hHn8x2l0/UHOZ7YDb/0WPLqpC53JMc+C1V auxoCy257EmgY2P8SveUttQ5LxzGB/lj8Y9s2MRAgUmUCwV3PUFsPYNRZr/uakGKjgio DdlaxnvINBqphKtILfXzdbgvlFsWk5JENdr3wNbamQKz66es18NEPpzv/fbT5ABaTVbE j0gpia8oZGAbdgqcurs7SDgDjFncJTw1fq3jf3h0QPpePfO4FyK0i2LOAIRkC6R8PJTU f+uA== X-Gm-Message-State: AOJu0YwzgmTHY4HMxvDczre9xemw9aL8nvhLjma1sYmHr55XaZG7Fmb6 FNoc+Rqbp5L9n/YXiNtmFBe2iGyymfLkx6QaBE4= X-Google-Smtp-Source: AGHT+IFGVzmlIcIC0WnjXKBiPerXJcLp7Gw8+wBpSNQ9MyxqF6awYw7mKVrGAe8wGqEtAPk+tIpgSw== X-Received: by 2002:a17:902:ecc5:b0:1c5:9d00:be84 with SMTP id a5-20020a170902ecc500b001c59d00be84mr9678037plh.33.1695282884183; Thu, 21 Sep 2023 00:54:44 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id p22-20020a170902a41600b001ae0152d280sm761928plq.193.2023.09.21.00.54.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 00:54:43 -0700 (PDT) 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 v3 1/8] util: Introduce qemu_get_runtime_dir() Date: Thu, 21 Sep 2023 16:54:15 +0900 Message-ID: <20230921075425.16738-2-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230921075425.16738-1-akihiko.odaki@daynix.com> References: <20230921075425.16738-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::62b; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x62b.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_get_runtime_dir() returns a dynamically allocated directory path that is appropriate for storing runtime files. It corresponds to "run" directory in Unix. With a tree-wide search, it was found that there are several cases where such a functionality is implemented so let's have one as a common utlity function. A notable feature of qemu_get_runtime_dir() is that it uses $XDG_RUNTIME_DIR if available. While the function is often called by executables which requires root privileges, it is still possible that they are called from a user without privilege to write the system runtime directory. In fact, I decided to write this patch when I ran virtiofsd in a Linux namespace created by a normal user and realized it tries to write the system runtime directory, not writable in this case. $XDG_RUNTIME_DIR should provide a writable directory in such cases. This function does not use qemu_get_local_state_dir() or its logic for Windows. Actually the implementation of qemu_get_local_state_dir() for Windows seems not right as it calls g_get_system_data_dirs(), which refers to $XDG_DATA_DIRS. In Unix terminology, it is basically "/usr/share", not "/var", which qemu_get_local_state_dir() is intended to provide. Instead, this function try to use the following in order: - $XDG_RUNTIME_DIR - LocalAppData folder - get_relocated_path(CONFIG_QEMU_LOCALSTATEDIR "/run") This function does not use g_get_user_runtime_dir() either as it falls back to g_get_user_cache_dir() when $XDG_DATA_DIRS is not available. In the case, we rather use: get_relocated_path(CONFIG_QEMU_LOCALSTATEDIR "/run") Signed-off-by: Akihiko Odaki --- include/qemu/osdep.h | 12 ++++++++++++ util/oslib-posix.c | 11 +++++++++++ util/oslib-win32.c | 26 ++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 2897720fac..bb857c910f 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -636,6 +636,18 @@ void qemu_set_cloexec(int fd); */ char *qemu_get_local_state_dir(void); +/** + * qemu_get_runtime_dir: + * + * Return a dynamically allocated directory path that is appropriate for storing + * runtime files. It corresponds to "run" directory in Unix, and uses + * $XDG_RUNTIME_DIR if available. + * + * The caller is responsible for releasing the value returned with g_free() + * after use. + */ +char *qemu_get_runtime_dir(void); + /** * qemu_getauxval: * @type: the auxiliary vector key to lookup diff --git a/util/oslib-posix.c b/util/oslib-posix.c index e86fd64e09..0c82717be5 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -273,6 +273,17 @@ qemu_get_local_state_dir(void) return get_relocated_path(CONFIG_QEMU_LOCALSTATEDIR); } +char * +qemu_get_runtime_dir(void) +{ + char *env = getenv("XDG_RUNTIME_DIR"); + if (env) { + return g_strdup(env); + } + + return get_relocated_path(CONFIG_QEMU_LOCALSTATEDIR "/run"); +} + void qemu_set_tty_echo(int fd, bool echo) { struct termios tty; diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 19a0ea7fbe..38df7b57b5 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -27,6 +27,8 @@ */ #include "qemu/osdep.h" +#include +#include #include #include "qapi/error.h" #include "qemu/main-loop.h" @@ -237,6 +239,30 @@ qemu_get_local_state_dir(void) return g_strdup(data_dirs[0]); } +char * +qemu_get_runtime_dir(void) +{ + size_t size = GetEnvironmentVariableA("XDG_RUNTIME_DIR", NULL, 0); + if (size) { + char *env = g_malloc(size); + GetEnvironmentVariableA("XDG_RUNTIME_DIR", env, size); + return env; + } + + PWSTR wpath; + const wchar_t *cwpath; + if (!SHGetKnownFolderPath(&FOLDERID_LocalAppData, KF_FLAG_DEFAULT, NULL, &wpath)) { + cwpath = wpath; + size = wcsrtombs(NULL, &cwpath, 0, &(mbstate_t){0}) + 1; + char *path = g_malloc(size); + wcsrtombs(path, &cwpath, size, &(mbstate_t){0}); + CoTaskMemFree(wpath); + return path; + } + + return get_relocated_path(CONFIG_QEMU_LOCALSTATEDIR "/run"); +} + void qemu_set_tty_echo(int fd, bool echo) { HANDLE handle = (HANDLE)_get_osfhandle(fd); From patchwork Thu Sep 21 07:54:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1837536 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=tJy3f2f+; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rrnqh507fz1ynj for ; Thu, 21 Sep 2023 17:59:44 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjEWT-0004Vz-Td; Thu, 21 Sep 2023 03:54:53 -0400 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 1qjEWR-0004Vg-Ky for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:54:51 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjEWQ-0001Ni-1K for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:54:51 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1c39f2b4f5aso5045935ad.0 for ; Thu, 21 Sep 2023 00:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1695282888; x=1695887688; darn=nongnu.org; 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=6ELYyiOadw0MQ3+N22lCN+444YhBa1c0nKVoGiIJnpU=; b=tJy3f2f+HwgSv3pYpZh/716lNAcGevCYI1kj7IcVIVnmPNFBwlSYBgF4eOpwR6EhDM 6zgX/d89IFrkAf1mLQbVehbfJ7bBOa1IHAmx4intNnSukEz2sLkPiB4YlwFxmK04ryik 20kisWmWXbr17EfpSwupjcFr73s418vr8BlZ0Hh2z0YqRMHqfZB3ON8Tfpay6SXtEeaZ uT9C1bDhI4Ve3mvi2hR5v6hvWrkc3feghSe8/EGQEJz5U3VbbwcO4F4hoUWtYRtHPyBg RVxe7B7F+3FE5iThgD6AHMamKJ9YyylnA8Wr1sXLwFtNKZRMA/CLGw1qUcNnurxacedj V1Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695282888; x=1695887688; 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=6ELYyiOadw0MQ3+N22lCN+444YhBa1c0nKVoGiIJnpU=; b=B0mLi4jN7UrxgvsvMmpt/H1X89NB6aZ+MTqIXAP38ez8KLD0Mrf6P8iITMtDNnsVSq KkcdSkLKVxVzDvSZkfTH6uWqrsLI73X3ZF3KZdvyE+0M869g+hKV8FoS6+weFtwcjfzu nim/C9mdegZrti8ON/V/5hoshD9OL2wk6XOlf+CfXGLGsuLqo3Ho2vzlqpJMoM27qoqE wn+MG34jjWK0EoensHFxv4tVI+NkXxVHBUjnCPS6Qk+OHTbm8bQaclLip8ZSBsGSkpkR LTfRD0M9/zMn6G4tZ44hW9+1sIKcjBtGiBhHwEcxgkdstmMFwXc085DjH3BXJ61MuM2o 5ifA== X-Gm-Message-State: AOJu0YzVqjdjZRlhcUjl0Xm6liMyo4T8K6wUMlAI/Tm3TPOCmTa7BT/C WA5gr23oYEvXwztcSp5I5PW8J6Z2vUw/UNWlXpY= X-Google-Smtp-Source: AGHT+IGUTIlFvWmMSLFsSDmuu01IkvmY+u8LNnGxK5z2/qiip8tHgDkKnj5nChA9qxXbsLo34s6GxQ== X-Received: by 2002:a17:902:c40a:b0:1c5:ad14:9095 with SMTP id k10-20020a170902c40a00b001c5ad149095mr5394853plk.64.1695282888558; Thu, 21 Sep 2023 00:54:48 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id p22-20020a170902a41600b001ae0152d280sm761928plq.193.2023.09.21.00.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 00:54:48 -0700 (PDT) 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 v3 2/8] ivshmem-server: Use qemu_get_runtime_dir() Date: Thu, 21 Sep 2023 16:54:16 +0900 Message-ID: <20230921075425.16738-3-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230921075425.16738-1-akihiko.odaki@daynix.com> References: <20230921075425.16738-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::630; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x630.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 5901f17707..313124dd45 100644 --- a/contrib/ivshmem-server/main.c +++ b/contrib/ivshmem-server/main.c @@ -14,7 +14,6 @@ #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; +static char *ivshmem_server_get_default_pid_file(void) +{ + g_autofree char *run = 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 = 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 only)\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); } @@ -189,10 +196,10 @@ main(int argc, char *argv[]) { IvshmemServer server; struct sigaction sa, sa_quit; + g_autofree char *default_pid_file = NULL; IvshmemServerArgs args = { .verbose = IVSHMEM_SERVER_DEFAULT_VERBOSE, .foreground = IVSHMEM_SERVER_DEFAULT_FOREGROUND, - .pid_file = IVSHMEM_SERVER_DEFAULT_PID_FILE, .unix_socket_path = IVSHMEM_SERVER_DEFAULT_UNIX_SOCK_PATH, .shm_path = IVSHMEM_SERVER_DEFAULT_SHM_PATH, .use_shm_open = true, @@ -207,6 +214,11 @@ main(int argc, char *argv[]) */ printf("*** Example code, do not use in production ***\n"); + qemu_init_exec_dir(argv[0]); + + default_pid_file = ivshmem_server_get_default_pid_file(); + args.pid_file = default_pid_file; + /* parse arguments, will exit on error */ ivshmem_server_parse_args(&args, argc, argv); From patchwork Thu Sep 21 07:54:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1837531 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=cZm/hPQg; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RrnmF01Vqz1ynX for ; Thu, 21 Sep 2023 17:56:43 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjEWZ-0004XF-EY; Thu, 21 Sep 2023 03:54:59 -0400 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 1qjEWY-0004Ws-7B for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:54:58 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjEWW-0001Pb-NF for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:54:57 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1c4194f769fso5025735ad.3 for ; Thu, 21 Sep 2023 00:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1695282895; x=1695887695; darn=nongnu.org; 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=jlU7vc1UjVKlw3Dv2jSmgf2SIHJeXqpTwAZU3tpQIrQ=; b=cZm/hPQgdO1OIaOcaXzj9wX8oxv6WfIo1vhIIzcbU7oveF8c1VPCO5C50TjHwBf5cP p9Nb9/r3F7sOBDlPGvkHnUDBKvbGlm+g8wosAHzd4Z92m6V14gJlf1aR/5ADAqP1tHdI aISpF3n0o0B04VK0KjsagGc3W6Sg5/RbivNrF+PYzeinw8aAz40OkG+2ajCPKSBLER25 3iefgGI8M8taREMddwUmPi9aTlWblDOqTOcPcTALRCsHIkV2Toindbr7DX72S7UXJT3p Fv8iH9gwhDhg9/cNnazGGML9iRvS2ariq/Rgc90CynsZx/eVZMeifWT4lzVw1ZzHN5p6 sySA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695282895; x=1695887695; 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=jlU7vc1UjVKlw3Dv2jSmgf2SIHJeXqpTwAZU3tpQIrQ=; b=WgvKI01fEo0VpDfbERyewpzzaNTdHPsQfaNjhBlnhIEwhVhBs3YdOZyF44IPQzMZqi /ZMZw5bQ8Eyzs84eWFP+rhUe6ZfZSvzIK8MMwa3/M+x6pMaIZu8LHGDbwmvPu/lhWUjJ LsYLcU32YGCDEBy46v1Z39AWaj71ME0JrvY4Gxb52G/1DUIQsZbCSWE1soifOsXOPVSk Y+CohUrqphlxQDdaZC+eeQ/sX1uZXdZSKoDjeuwt0QrnHuIn75H9Q4Sem3Hbme1JfyJn fJ8sgHhHz3JIUTOeFgrWeA7I+lXsBY9ujFHtO3gaJdpATS5IqMouggOEP3j4lIGPwuNN 4wRA== X-Gm-Message-State: AOJu0Yz1YIUqKuuaqmmewoY3mC/S57NaYbIuFGljekxhcM+lSHVNgrgU Dsgyhk1FgZ+cD4/gXTK9C6O3FFSPyRglx9EQWOs= X-Google-Smtp-Source: AGHT+IG2h8BG2Z51cqBiO+32XQNTcrt8y2Ij0FCZ1sFQfZyO86MeyubAKt+3Hm5xn+8l6fwhjdyg1w== X-Received: by 2002:a17:902:b901:b0:1bf:c59:c944 with SMTP id bf1-20020a170902b90100b001bf0c59c944mr4039169plb.22.1695282895097; Thu, 21 Sep 2023 00:54:55 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id p22-20020a170902a41600b001ae0152d280sm761928plq.193.2023.09.21.00.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 00:54:54 -0700 (PDT) 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 v3 3/8] contrib/rdmacm-mux: Use qemu_get_runtime_dir() Date: Thu, 21 Sep 2023 16:54:17 +0900 Message-ID: <20230921075425.16738-4-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230921075425.16738-1-akihiko.odaki@daynix.com> References: <20230921075425.16738-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::62b; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x62b.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_get_runtime_dir() is used to construct the default Unix socket path. Signed-off-by: Akihiko Odaki --- contrib/rdmacm-mux/main.c | 22 ++++++++++++++-------- contrib/rdmacm-mux/meson.build | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c index 771ca01e03..00c14031ca 100644 --- a/contrib/rdmacm-mux/main.c +++ b/contrib/rdmacm-mux/main.c @@ -14,6 +14,7 @@ */ #include "qemu/osdep.h" +#include "qemu/cutils.h" #include #include #include @@ -40,8 +41,6 @@ #define CM_REQ_DGID_POS 80 #define CM_SIDR_REQ_DGID_POS 44 -/* The below can be override by command line parameter */ -#define UNIX_SOCKET_PATH "/var/run/rdmacm-mux" /* Has format %s-%s-%d" -- */ #define SOCKET_PATH_MAX (PATH_MAX - NAME_MAX - sizeof(int) - 2) #define RDMA_PORT_NUM 1 @@ -77,7 +76,13 @@ typedef struct RdmaCmServer { static RdmaCMServer server = {0}; -static void usage(const char *progname) +static char *get_default_unix_socket_path(void) +{ + g_autofree char *run = qemu_get_runtime_dir(); + return g_build_filename(run, "rdmacm-mux", NULL); +} + +static void usage(const char *progname, const char *default_unix_socket_path) { printf("Usage: %s [OPTION]...\n" "Start a RDMA-CM multiplexer\n" @@ -86,7 +91,7 @@ static void usage(const char *progname) "\t-d rdma-device-name Name of RDMA device to register with\n" "\t-s unix-socket-path Path to unix socket to listen on (default %s)\n" "\t-p rdma-device-port Port number of RDMA device to register with (default %d)\n", - progname, UNIX_SOCKET_PATH, RDMA_PORT_NUM); + progname, default_unix_socket_path, RDMA_PORT_NUM); } static void help(const char *progname) @@ -97,16 +102,16 @@ static void help(const char *progname) static void parse_args(int argc, char *argv[]) { int c; - char unix_socket_path[SOCKET_PATH_MAX]; + g_autofree char *default_unix_socket_path = get_default_unix_socket_path(); + char *unix_socket_path = default_unix_socket_path; strcpy(server.args.rdma_dev_name, ""); - strcpy(unix_socket_path, UNIX_SOCKET_PATH); server.args.rdma_port_num = RDMA_PORT_NUM; while ((c = getopt(argc, argv, "hs:d:p:")) != -1) { switch (c) { case 'h': - usage(argv[0]); + usage(argv[0], default_unix_socket_path); exit(0); case 'd': @@ -115,7 +120,7 @@ static void parse_args(int argc, char *argv[]) case 's': /* This is temporary, final name will build below */ - strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX - 1); + unix_socket_path = optarg; break; case 'p': @@ -811,6 +816,7 @@ int main(int argc, char *argv[]) { int rc; + qemu_init_exec_dir(argv[0]); memset(&server, 0, sizeof(server)); parse_args(argc, argv); diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build index 36c9c89630..59f60f9cac 100644 --- a/contrib/rdmacm-mux/meson.build +++ b/contrib/rdmacm-mux/meson.build @@ -1,7 +1,7 @@ if have_pvrdma # FIXME: broken on big endian architectures executable('rdmacm-mux', files('main.c'), genh, - dependencies: [glib, libumad], + dependencies: [glib, libumad, qemuutil], build_by_default: false, install: false) endif From patchwork Thu Sep 21 07:54:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1837537 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=U2GsCXIo; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rrnr81SJXz1ynX for ; Thu, 21 Sep 2023 18:00:08 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjEWg-0004iG-4a; Thu, 21 Sep 2023 03:55:06 -0400 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 1qjEWe-0004f9-9b for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:04 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjEWc-0001Sq-LX for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:04 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1c44a25bd0bso12076245ad.0 for ; Thu, 21 Sep 2023 00:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1695282901; x=1695887701; darn=nongnu.org; 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=+dsr6eyuJ9VSJfAqFZ+Sn8WOb7QBRrG/FmPzrYRLnEY=; b=U2GsCXIoPFBYykwz2dirjEzpgUtVgWoOPDafjsAaeSGXlH7qPQGZRIW95BLIqnGjwW g7umgSKCFu1ca0yptghvTHQ/y7GQdXy8l5Bq2LCun777hmcVXBhGZ+ivpqYwu1dDN2jH J4B1gD9UpbFQ7i1hcmEPGHYzVYRDivvgon2b1hay6PeWzPFLEqbpDtSs3FPAqWJc7kFx clU45nDlEMQTeLCn3dZ5OOR/dl9MVmChTLo4K7b0P9lz9hNEHYC1ShgjpEQiPVro2Vpo paLJOjWVksh6kCPDRhDUMqGPe8sWAucBm8lmVR5GhElxaA13Q1CmKMMUnXHUjMKf36NJ OYKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695282901; x=1695887701; 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=+dsr6eyuJ9VSJfAqFZ+Sn8WOb7QBRrG/FmPzrYRLnEY=; b=heHxP8pjEIffYcYi6aKh1fJSggxE6DTgrtVx4rTDZynx9tTjd5Tv7jgWgYEpA5IcD3 yEPe3tg7eVXjsL7g6XC5ho41RTiFS2QkSWeGRF0LxaMvGoacXcj3xFRG2M5VuzHmzWvH y9m5Eg5AaBKPamznqYqXXIZoeyMFi8pHA+Wg5bJGpjrxSoOmGaN5HV2EEMcevd1Lr6r/ yRr3bcjteA+hstZOvHjK2JfJKraKYDQzrVUke2h7XVGk5T6yqbGqYe0cXlSkS92PZC92 hckTDayBD2Tb6Hn/9cUIYXdFtshiYGQXdDwmC75AABF21gJbdGoNApfhWQYoe5bUtwjS 7ktQ== X-Gm-Message-State: AOJu0YyUgT4TuKgkMNj7AFSk9DOfW+fToq5jddKzjg3LeZhmgBktQRe4 A9UVnMkjKqfFf0gA4ffsKbdw0qx6t4LNRXVVsSQ= X-Google-Smtp-Source: AGHT+IGhor9je1oMW+9ljkb6gPnNnfkJv4J+3cOZJN3lvufQK8RUdZQKCzNFPt0Xg4Im69lT2Kl4zA== X-Received: by 2002:a17:902:f813:b0:1b7:f64b:379b with SMTP id ix19-20020a170902f81300b001b7f64b379bmr5949643plb.17.1695282901422; Thu, 21 Sep 2023 00:55:01 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id p22-20020a170902a41600b001ae0152d280sm761928plq.193.2023.09.21.00.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 00:55:01 -0700 (PDT) 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 v3 4/8] qga: Use qemu_get_runtime_dir() Date: Thu, 21 Sep 2023 16:54:18 +0900 Message-ID: <20230921075425.16738-5-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230921075425.16738-1-akihiko.odaki@daynix.com> References: <20230921075425.16738-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::62a; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x62a.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=ham 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_get_runtime_dir() is used to construct the default state directory. Signed-off-by: Akihiko Odaki --- qga/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qga/main.c b/qga/main.c index 8668b9f3d3..145ee02df3 100644 --- a/qga/main.c +++ b/qga/main.c @@ -45,12 +45,11 @@ #define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0" #endif /* CONFIG_BSD */ #define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0" -#define QGA_STATE_RELATIVE_DIR "run" #else #define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0" -#define QGA_STATE_RELATIVE_DIR "qemu-ga" #define QGA_SERIAL_PATH_DEFAULT "COM1" #endif +#define QGA_STATE_RELATIVE_DIR "qemu-ga" #ifdef CONFIG_FSFREEZE #define QGA_FSFREEZE_HOOK_DEFAULT CONFIG_QEMU_CONFDIR "/fsfreeze-hook" #endif @@ -129,12 +128,12 @@ static void stop_agent(GAState *s, bool requested); static void init_dfl_pathnames(void) { - g_autofree char *state = qemu_get_local_state_dir(); + g_autofree char *run = qemu_get_runtime_dir(); g_assert(dfl_pathnames.state_dir == NULL); g_assert(dfl_pathnames.pidfile == NULL); - dfl_pathnames.state_dir = g_build_filename(state, QGA_STATE_RELATIVE_DIR, NULL); - dfl_pathnames.pidfile = g_build_filename(state, QGA_STATE_RELATIVE_DIR, "qemu-ga.pid", NULL); + dfl_pathnames.state_dir = g_build_filename(run, QGA_STATE_RELATIVE_DIR, NULL); + dfl_pathnames.pidfile = g_build_filename(run, QGA_STATE_RELATIVE_DIR, "qemu-ga.pid", NULL); } static void quit_handler(int sig) From patchwork Thu Sep 21 07:54:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1837534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=FFIEwVfx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RrnqJ2GR2z1ynj for ; Thu, 21 Sep 2023 17:59:24 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjEWq-0005GA-08; Thu, 21 Sep 2023 03:55:16 -0400 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 1qjEWn-00052Q-Ek for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:13 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjEWi-0001Yc-Fc for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:13 -0400 Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-577e62e2adfso445262a12.2 for ; Thu, 21 Sep 2023 00:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1695282907; x=1695887707; darn=nongnu.org; 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=+WqIB3gVUWoV5tx6z3hTNmJPFl9aZDKmRqWqmbRKnMA=; b=FFIEwVfxYB+xKtooGZOVBfL3PkYJ07EVXtdeD/wexaDkpNM6eP7neCJxUVA4+8N/wi jBoo1qoHKqW8OMj9lV7CohyL6DAxssgXgIDuT0r679sUh5Him9uorQBzFpDPyQrJXwiu Z9CvHo6Mw3SzX/Cm0h2DaI71ZvCcuV2OElKKCnm3nvw2B9tASopQVZIXsihcwJEXQhgB ahcnfRflSMaqt1E2rW4U39o8hfHDZlV0mBxq8bxPI+NO91hsxuHim1CsPxfcXbFI7BzZ w9fCFPxBuqIlbRCbzeWh+dCe2Lp7YBJKYLc9byvlroR9JykuG/egNdt7guuBcaQm4AVH tclQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695282907; x=1695887707; 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=+WqIB3gVUWoV5tx6z3hTNmJPFl9aZDKmRqWqmbRKnMA=; b=PP2ws2yEJrbbdLwz8+R/kCayB1OJaSaZ8Bptw1F3ebWnKisqqVA5ROiK4sARAAdSaG aCkZzujYk29XCJtsTr3NXAkO6F26u244B0Vh7rh3EUXPsOTQZsoVBfpDjPRJK96Jeo06 lPBhjp2MO7+3U+L73im42NGTYgiH99CW0hRQWJv3xVBbT7t9mkhgSO3FHzG0nlq2/6Qs x59WF4dXwpPITsvSd5MiyBJCPUNmzhJHYsnYPZ/hthbBk7qCkaTROqoWYAtivVtrc8Th yi6Z53W7i/23/uFRVfIv4zpH/d7IZJD093rjIwxStej7TpcGIesC3zkUTUkFkm8GabI2 pPlA== X-Gm-Message-State: AOJu0YyQwHH+ggHhK3Dt6+h7lLOlnWrfEUHCutk2Hjnv1GuFOtrpsoR5 Sy6eHCVtzD4ix4Ezycf1QvGcXPcaYK8rxPTIlew= X-Google-Smtp-Source: AGHT+IFHgpi8n1ftI8b8mX73/Pv7vz9W3FemR7w2fHwwL5FQ+bU4wAzGGFj7DblErRboprKwJ3dP1w== X-Received: by 2002:a05:6a20:8e1c:b0:14b:8b82:867f with SMTP id y28-20020a056a208e1c00b0014b8b82867fmr5250370pzj.50.1695282907100; Thu, 21 Sep 2023 00:55:07 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id p22-20020a170902a41600b001ae0152d280sm761928plq.193.2023.09.21.00.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 00:55:06 -0700 (PDT) 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 v3 5/8] scsi: Use qemu_get_runtime_dir() Date: Thu, 21 Sep 2023 16:54:19 +0900 Message-ID: <20230921075425.16738-6-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230921075425.16738-1-akihiko.odaki@daynix.com> References: <20230921075425.16738-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::52d; envelope-from=akihiko.odaki@daynix.com; helo=mail-pg1-x52d.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_get_runtime_dir() is used to construct the default paths. Signed-off-by: Akihiko Odaki --- scsi/qemu-pr-helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c index c6c6347e9b..507f23357f 100644 --- a/scsi/qemu-pr-helper.c +++ b/scsi/qemu-pr-helper.c @@ -77,10 +77,10 @@ static int gid = -1; static void compute_default_paths(void) { - g_autofree char *state = qemu_get_local_state_dir(); + g_autofree char *run = qemu_get_runtime_dir(); - socket_path = g_build_filename(state, "run", "qemu-pr-helper.sock", NULL); - pidfile = g_build_filename(state, "run", "qemu-pr-helper.pid", NULL); + socket_path = g_build_filename(run, "qemu-pr-helper.sock", NULL); + pidfile = g_build_filename(run, "qemu-pr-helper.pid", NULL); } static void usage(const char *name) From patchwork Thu Sep 21 07:54:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1837535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=Xiu58dMx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rrnqh2bQVz1ynX for ; Thu, 21 Sep 2023 17:59:44 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjEWr-0005MU-MY; Thu, 21 Sep 2023 03:55:17 -0400 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 1qjEWp-0005Do-Iy for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:15 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjEWo-0001bZ-4F for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:15 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1c43b4b02c1so4863655ad.3 for ; Thu, 21 Sep 2023 00:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1695282912; x=1695887712; darn=nongnu.org; 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=XX44FJTRZg1+PqvDSJfTem/Daafu9UBqtypGiG20los=; b=Xiu58dMx0B9Fc/r5Z3RdTkehv/FiFaR6zcLtX2sVpFyPSQLfFMaz17Izc0A1cjQP8N er26ahePyCLEU1phXB4Bxiws+c/zGLwOQiOmCjt1gvNXJPPvp7TYWYitehW1M3O9pwGm S2lLNBsJ9imR8QPnhFh0eLmlPD3vywOBympuDkwAcBhHNowTpBmJiExyck7H6hA8pQ3O qNmpOmz2MvBXNbtQgSKThcZ/BRxCpKQ6+CUARMxn0iSkd9tYCkPQ9/DysxAhiB7tUWu6 xtvhVjtaQh0cjVPA9e4bcC86sYOP4craluE+RVcnTfEi5bAS6Sq8mjHpS+JfLw7KsikA 0efg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695282912; x=1695887712; 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=XX44FJTRZg1+PqvDSJfTem/Daafu9UBqtypGiG20los=; b=iCBWki62W7KImPGcqVh8IyZvAG3v0FGFc+ZXTOySb08m7HpEQE2v8tTOy515mGETTG pIYB2z1zOacwFlZh1wMnhtaCHNj46oQ3jvqqfyTa0c0/JVCFw1ud3Jm99/v34FzXVDPw BQ143mnoLruF4C4XOSwenMelIijRSiJkB+cdqQeGoKHoCyWG3FBep2RogeidWt1jjhiv 4/88YNMorevvMba2x/6bU0c2elJHC2i7uVfCkJiFfiomC2JsZpobr5dY8Ue1/13iUWtT mShPhjaL1x0G3dnQKpU6gbR0k75m5XBJyAFPq/4aoG2UwqldCTPS48/T5Yp+9ATC/26D lugg== X-Gm-Message-State: AOJu0YxPizOJCtvz6X9AgXx6oy1MqR8AQYcYXDh2FiWu3CJ9dLMml0Xh UAjSqM19KTV6VNK66M1z7VecJNcVN2ipnOufZM4= X-Google-Smtp-Source: AGHT+IFaMWHOap2ToMQvy7EHn6kd0Y5gSGrQAOHSWgcsq1JpvrbwAPPU3om6Od7R1Po2vNL5tOG/xQ== X-Received: by 2002:a17:902:76ca:b0:1b8:94e9:e7cb with SMTP id j10-20020a17090276ca00b001b894e9e7cbmr3865066plt.21.1695282912682; Thu, 21 Sep 2023 00:55:12 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id p22-20020a170902a41600b001ae0152d280sm761928plq.193.2023.09.21.00.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 00:55:12 -0700 (PDT) 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 v3 6/8] module: Use qemu_get_runtime_dir() Date: Thu, 21 Sep 2023 16:54:20 +0900 Message-ID: <20230921075425.16738-7-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230921075425.16738-1-akihiko.odaki@daynix.com> References: <20230921075425.16738-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::632; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x632.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_get_runtime_dir() is used to construct the path to module upgrades. Signed-off-by: Akihiko Odaki --- util/module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/module.c b/util/module.c index 32e263163c..580658edf4 100644 --- a/util/module.c +++ b/util/module.c @@ -242,7 +242,8 @@ int module_load(const char *prefix, const char *name, Error **errp) version_dir = g_strcanon(g_strdup(QEMU_PKGVERSION), G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "+-.~", '_'); - dirs[n_dirs++] = g_strdup_printf("/var/run/qemu/%s", version_dir); + g_autofree char *run = qemu_get_runtime_dir(); + dirs[n_dirs++] = g_build_filename(run, "qemu", version_dir, NULL); #endif assert(n_dirs <= ARRAY_SIZE(dirs)); From patchwork Thu Sep 21 07:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1837532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=b8HfBxF3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rrnmf66bdz1ynX for ; Thu, 21 Sep 2023 17:57:06 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjEWv-0005Ro-2M; Thu, 21 Sep 2023 03:55:21 -0400 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 1qjEWt-0005QH-De for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:19 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjEWr-0001kc-Tj for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:19 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1c3bd829b86so5362675ad.0 for ; Thu, 21 Sep 2023 00:55:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1695282916; x=1695887716; darn=nongnu.org; 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=BwxdqCjoYRjwt5W3IBIll6piBuHczsH0wiYwmGYAieo=; b=b8HfBxF38uEGvmUWIxAFkVR+Pm3ENjqaxypFiO3IiZEJGgQIEPOqwUfM/7RHK/zTGd 7OcGOzfVceHveHev1MY9mgfdXD+pjbv1F/fBhrEZ5goQOOmj3j8L47jAZXIzWhTMna8F dVl9RM6TXYiuVbqHrFiVV2ud0KSPGGMyMelp8cSiGBc1tDU63cIZZ6G4DCttsKb6pQvi rOpEsoxzPS9uMwY0c4KScCnycfT6+9iEeyFkRD1YsIGv3ETRW8Tq5xeAAo/UMSKQ/E2h LLyjBAmemhxLBtuvRM47kaFi1CzaVjJjkLVkbbl7MvfwqDST5k26AaVqE5z5f6K7HBTV bc0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695282916; x=1695887716; 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=BwxdqCjoYRjwt5W3IBIll6piBuHczsH0wiYwmGYAieo=; b=F9TAQcO2fr0+sEjlfxdVUiZ4DBVpA3eYbZbLbBt6qHeS2/eAf90ZtsSTITh3QQO2Cd 4d79/urO+E/R/lSu+N3Co4pBAhxrwJvMbfjywfJ2cXpeD+GOPqF9qhcFiaAKAF8FTl3H qkBd7/Y+izs15qV4sj3JjUF19qpgp4FQ3XO/MpdY9Ef104i7LG17QajyoXwtVljHSQXI nyUYwABoGkFxQn5E5WZmNCujNE2J3S5V7N6u6VUOjoq2o6mVJ49dEEFenZ5S6EIRxndi /rBZvhBjV/+NlZEtLtR7qygU7htbZUvU1zmJHSrbhkc/fluESfArU8zUCQZxOGmgrqun U8Tw== X-Gm-Message-State: AOJu0YwgDGtK0Vn88cbOnVdll0r6ETzEeZUx9ljwKU/aX58bbbXVVYjc qZpxljcuvwr1XewVV+fRJUVRaQjQriVyGODouVc= X-Google-Smtp-Source: AGHT+IH7nIquB+DMv/CPBw8OR3yLj3tGkrYUNDykHy4NgyvuZ2VSaZVzLcNtjkCnMAQ9X4Na0Bz7dA== X-Received: by 2002:a17:902:e5d2:b0:1c3:ae56:4594 with SMTP id u18-20020a170902e5d200b001c3ae564594mr4273593plf.49.1695282916472; Thu, 21 Sep 2023 00:55:16 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id p22-20020a170902a41600b001ae0152d280sm761928plq.193.2023.09.21.00.55.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 00:55:16 -0700 (PDT) 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 v3 7/8] util: Remove qemu_get_local_state_dir() Date: Thu, 21 Sep 2023 16:54:21 +0900 Message-ID: <20230921075425.16738-8-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230921075425.16738-1-akihiko.odaki@daynix.com> References: <20230921075425.16738-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::62a; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x62a.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There are no users of the function anymore. Signed-off-by: Akihiko Odaki --- include/qemu/osdep.h | 8 -------- util/oslib-posix.c | 6 ------ util/oslib-win32.c | 10 ---------- 3 files changed, 24 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index bb857c910f..cc585447ef 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -628,14 +628,6 @@ ssize_t qemu_write_full(int fd, const void *buf, size_t count) void qemu_set_cloexec(int fd); -/* Return a dynamically allocated directory path that is appropriate for storing - * local state. - * - * The caller is responsible for releasing the value returned with g_free() - * after use. - */ -char *qemu_get_local_state_dir(void); - /** * qemu_get_runtime_dir: * diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 0c82717be5..f3054ad2cd 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -267,12 +267,6 @@ int qemu_socketpair(int domain, int type, int protocol, int sv[2]) return ret; } -char * -qemu_get_local_state_dir(void) -{ - return get_relocated_path(CONFIG_QEMU_LOCALSTATEDIR); -} - char * qemu_get_runtime_dir(void) { diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 38df7b57b5..f93c3bff8e 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -229,16 +229,6 @@ int qemu_get_thread_id(void) return GetCurrentThreadId(); } -char * -qemu_get_local_state_dir(void) -{ - const char * const *data_dirs = g_get_system_data_dirs(); - - g_assert(data_dirs && data_dirs[0]); - - return g_strdup(data_dirs[0]); -} - char * qemu_get_runtime_dir(void) { From patchwork Thu Sep 21 07:54:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1837533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=UCtDvIgr; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rrnp31FhZz1ynX for ; Thu, 21 Sep 2023 17:58:19 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjEX2-0005ab-K7; Thu, 21 Sep 2023 03:55:28 -0400 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 1qjEWz-0005Zu-Sb for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:25 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjEWy-0001s5-Aj for qemu-devel@nongnu.org; Thu, 21 Sep 2023 03:55:25 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1c3f97f2239so5625885ad.0 for ; Thu, 21 Sep 2023 00:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1695282923; x=1695887723; darn=nongnu.org; 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=D7XgavntPO93Ri3KubETdfMRGZmmewXPeIHFa3pR3w4=; b=UCtDvIgr5cW7qKvh8DQSdRDOqMQS7od0X9ZJrvWJTNIdo9SaK2A23gOUnYuNnWkvNO mIw1x+vYLoz22EkWUS9fGRg4MGKGlTpFJ/h4UyU0FnicR/p+47SZAdjLy2bhDEw61CPy sXXcubAxeOVKmxvH9ays2FxiRDNM6g8SrCMe19HtD8Kyw01MDi8bwMT8vXnBTJtWtNsx vsQnxDwMhg+/Yk/8KyFEyj2h3wrGCwOxcyUgdyQTmu48sPQbSyPaYvx4npz1IXvifptG RQ0o8asGuJ+DXDsDqGhhMYi+j4MVZ0h/FM87rUtoHDDmVWTIWgcSKisVYwY6bYPdDNKL pBIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695282923; x=1695887723; 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=D7XgavntPO93Ri3KubETdfMRGZmmewXPeIHFa3pR3w4=; b=fBHVPCn+td2KJE7gYz1pn9dg5NOpGF8+xRojtMf++jT83i/bjOHlEkBTWeBBmJzw1h eFvYErmP3Sywrt/u5kgGLWGephMD5bOfk3PGIgdM2Gm3r2wloFrTfM4YLeBZZwICSMx7 9wOQ9SK+xpCf+FY1JaQoKgVAni490miFMl3iv6BgsyxlgqnH0aZ8cadk2CqtNHEmX+gH 5DcO7kFvbpyvpn9oJR69wfDQhLV/pKVu+bf9vstnSkcW6xmUC3/VMn6ahWya3W3dKLO6 HwOGjEDn2d5hyZe4xERb+rh4Odbi7pix5hO8A0TdKjHPGZZeUZy8Z2TTjx5+lSiADmdE pfBQ== X-Gm-Message-State: AOJu0YyI6raEjuXKREYhFzrTym6dgikVJLLtgTjr593cwPlHC5ZFAMdI ECT9W7O9qK96fLMXnscjZ/DsUAkJtn1GTeGtSgI= X-Google-Smtp-Source: AGHT+IG/v1T7zdMXQ46L8xw0TEVK5wa9C8hkq5sN3uwC6lT4Ey31J9VdmWXzaQisa5tsjvOGXEKLpA== X-Received: by 2002:a17:902:d4c4:b0:1bf:2e5c:7367 with SMTP id o4-20020a170902d4c400b001bf2e5c7367mr5672348plg.42.1695282922889; Thu, 21 Sep 2023 00:55:22 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:a840:1e00:d54:e521:8bac:7bed]) by smtp.gmail.com with ESMTPSA id p22-20020a170902a41600b001ae0152d280sm761928plq.193.2023.09.21.00.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 00:55:22 -0700 (PDT) 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 v3 8/8] spice-app: Use qemu_get_runtime_dir() Date: Thu, 21 Sep 2023 16:54:22 +0900 Message-ID: <20230921075425.16738-9-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230921075425.16738-1-akihiko.odaki@daynix.com> References: <20230921075425.16738-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::635; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x635.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_get_runtime_dir() provides QEMU-specific fallback of runtime directory. Signed-off-by: Akihiko Odaki --- ui/spice-app.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/spice-app.c b/ui/spice-app.c index 405fb7f9f5..f6c2343213 100644 --- a/ui/spice-app.c +++ b/ui/spice-app.c @@ -151,8 +151,8 @@ static void spice_app_display_early_init(DisplayOptions *opts) atexit(spice_app_atexit); if (qemu_name) { - app_dir = g_build_filename(g_get_user_runtime_dir(), - "qemu", qemu_name, NULL); + g_autofree char *run = qemu_get_runtime_dir(); + app_dir = g_build_filename(run, "qemu", qemu_name, NULL); if (g_mkdir_with_parents(app_dir, S_IRWXU) < -1) { error_report("Failed to create directory %s: %s", app_dir, strerror(errno));