From nobody Tue Feb 10 11:15:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650462948465473.0884680803755; Wed, 20 Apr 2022 06:55:48 -0700 (PDT) Received: from localhost ([::1]:54124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhAo7-0001gQ-6Q for importer@patchew.org; Wed, 20 Apr 2022 09:55:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhAOB-0000KS-36 for qemu-devel@nongnu.org; Wed, 20 Apr 2022 09:28:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhAO9-0004l1-4n for qemu-devel@nongnu.org; Wed, 20 Apr 2022 09:28:58 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-48-dAqNgqUpOjGy4uVrBUNx0w-1; Wed, 20 Apr 2022 09:28:55 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C5C33C025CB; Wed, 20 Apr 2022 13:28:54 +0000 (UTC) Received: from localhost (unknown [10.39.208.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32F8840D2853; Wed, 20 Apr 2022 13:28:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650461336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YzUz8oqEKiRI0YpLZJ5t2ojZX0YZv+BX9qrIiG+GT2g=; b=dNNZvaqrrkxpZW2oeL0LF033Y7bysO6YimjPnNhkfK197/Yf27GLNa9mIdzYXE1AM18k6U c3B6oXiYcGzB+XS/nuproGOo3ExftzoYLL38TsXFXW4UJSH8CqXAYQsfFJ0UhYTrE5FW3V L/Fwr0sgoTlertRUrULK87suLp41kqw= X-MC-Unique: dAqNgqUpOjGy4uVrBUNx0w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 22/41] include: move qemu_*_exec_dir() to cutils Date: Wed, 20 Apr 2022 17:26:05 +0400 Message-Id: <20220420132624.2439741-23-marcandre.lureau@redhat.com> In-Reply-To: <20220420132624.2439741-1-marcandre.lureau@redhat.com> References: <20220420132624.2439741-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , "open list:Block layer core" , Darren Kenny , Stefan Weil , Bandan Das , Qiuhao Li , Alexander Bulekov , Hanna Reitz , Stefan Hajnoczi , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650462950676100001 From: Marc-Andr=C3=A9 Lureau The function is required by get_relocated_path(), which is used by qemu-ga and may be generally useful. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/qemu/cutils.h | 7 ++ include/qemu/osdep.h | 8 -- qemu-io.c | 1 + storage-daemon/qemu-storage-daemon.c | 1 + tests/qtest/fuzz/fuzz.c | 1 + util/cutils.c | 109 +++++++++++++++++++++++++++ util/oslib-posix.c | 81 -------------------- util/oslib-win32.c | 36 --------- 8 files changed, 119 insertions(+), 125 deletions(-) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 5c6572d44422..40e10e19a7ed 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -193,6 +193,13 @@ int uleb128_decode_small(const uint8_t *in, uint32_t *= n); */ int qemu_pstrcmp0(const char **str1, const char **str2); =20 +/* Find program directory, and save it for later usage with + * qemu_get_exec_dir(). + * Try OS specific API first, if not working, parse from argv0. */ +void qemu_init_exec_dir(const char *argv0); + +/* Get the saved exec dir. */ +const char *qemu_get_exec_dir(void); =20 /** * get_relocated_path: diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index a87f1b7f32e6..9fd52d6a33a7 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -567,14 +567,6 @@ bool fips_get_state(void); */ char *qemu_get_local_state_pathname(const char *relative_pathname); =20 -/* Find program directory, and save it for later usage with - * qemu_get_exec_dir(). - * Try OS specific API first, if not working, parse from argv0. */ -void qemu_init_exec_dir(const char *argv0); - -/* Get the saved exec dir. */ -const char *qemu_get_exec_dir(void); - /** * qemu_getauxval: * @type: the auxiliary vector key to lookup diff --git a/qemu-io.c b/qemu-io.c index 952a36643b0c..458fadd99a92 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -16,6 +16,7 @@ #endif =20 #include "qemu/copyright.h" +#include "qemu/cutils.h" #include "qapi/error.h" #include "qemu-io.h" #include "qemu/error-report.h" diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-sto= rage-daemon.c index a4415e8c995b..63b155013ed7 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -44,6 +44,7 @@ =20 #include "qemu/copyright.h" #include "qemu-version.h" +#include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/help_option.h" diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index 5f77c849837f..d3afd294db24 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -15,6 +15,7 @@ =20 #include =20 +#include "qemu/cutils.h" #include "qemu/datadir.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" diff --git a/util/cutils.c b/util/cutils.c index b2777210e7da..443927275fdb 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -931,6 +931,115 @@ static inline const char *next_component(const char *= dir, int *p_len) return dir; } =20 +static const char *exec_dir; + +void qemu_init_exec_dir(const char *argv0) +{ +#ifdef G_OS_WIN32 + char *p; + char buf[MAX_PATH]; + DWORD len; + + if (exec_dir) { + return; + } + + len =3D GetModuleFileName(NULL, buf, sizeof(buf) - 1); + if (len =3D=3D 0) { + return; + } + + buf[len] =3D 0; + p =3D buf + len - 1; + while (p !=3D buf && *p !=3D '\\') { + p--; + } + *p =3D 0; + if (access(buf, R_OK) =3D=3D 0) { + exec_dir =3D g_strdup(buf); + } else { + exec_dir =3D CONFIG_BINDIR; + } +#else + char *p =3D NULL; + char buf[PATH_MAX]; + + if (exec_dir) { + return; + } + +#if defined(__linux__) + { + int len; + len =3D readlink("/proc/self/exe", buf, sizeof(buf) - 1); + if (len > 0) { + buf[len] =3D 0; + p =3D buf; + } + } +#elif defined(__FreeBSD__) \ + || (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) + { +#if defined(__FreeBSD__) + static int mib[4] =3D {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1= }; +#else + static int mib[4] =3D {CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PAT= HNAME}; +#endif + size_t len =3D sizeof(buf) - 1; + + *buf =3D '\0'; + if (!sysctl(mib, ARRAY_SIZE(mib), buf, &len, NULL, 0) && + *buf) { + buf[sizeof(buf) - 1] =3D '\0'; + p =3D buf; + } + } +#elif defined(__APPLE__) + { + char fpath[PATH_MAX]; + uint32_t len =3D sizeof(fpath); + if (_NSGetExecutablePath(fpath, &len) =3D=3D 0) { + p =3D realpath(fpath, buf); + if (!p) { + return; + } + } + } +#elif defined(__HAIKU__) + { + image_info ii; + int32_t c =3D 0; + + *buf =3D '\0'; + while (get_next_image_info(0, &c, &ii) =3D=3D B_OK) { + if (ii.type =3D=3D B_APP_IMAGE) { + strncpy(buf, ii.name, sizeof(buf)); + buf[sizeof(buf) - 1] =3D 0; + p =3D buf; + break; + } + } + } +#endif + /* If we don't have any way of figuring out the actual executable + location then try argv[0]. */ + if (!p && argv0) { + p =3D realpath(argv0, buf); + } + if (p) { + exec_dir =3D g_path_get_dirname(p); + } else { + exec_dir =3D CONFIG_BINDIR; + } +#endif +} + +const char *qemu_get_exec_dir(void) +{ + return exec_dir; +} + + char *get_relocated_path(const char *dir) { size_t prefix_len =3D strlen(CONFIG_PREFIX); diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 161f1123259f..4f18cc612850 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -321,87 +321,6 @@ void qemu_set_tty_echo(int fd, bool echo) tcsetattr(fd, TCSANOW, &tty); } =20 -static const char *exec_dir; - -void qemu_init_exec_dir(const char *argv0) -{ - char *p =3D NULL; - char buf[PATH_MAX]; - - if (exec_dir) { - return; - } - -#if defined(__linux__) - { - int len; - len =3D readlink("/proc/self/exe", buf, sizeof(buf) - 1); - if (len > 0) { - buf[len] =3D 0; - p =3D buf; - } - } -#elif defined(__FreeBSD__) \ - || (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)) - { -#if defined(__FreeBSD__) - static int mib[4] =3D {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1= }; -#else - static int mib[4] =3D {CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PAT= HNAME}; -#endif - size_t len =3D sizeof(buf) - 1; - - *buf =3D '\0'; - if (!sysctl(mib, ARRAY_SIZE(mib), buf, &len, NULL, 0) && - *buf) { - buf[sizeof(buf) - 1] =3D '\0'; - p =3D buf; - } - } -#elif defined(__APPLE__) - { - char fpath[PATH_MAX]; - uint32_t len =3D sizeof(fpath); - if (_NSGetExecutablePath(fpath, &len) =3D=3D 0) { - p =3D realpath(fpath, buf); - if (!p) { - return; - } - } - } -#elif defined(__HAIKU__) - { - image_info ii; - int32_t c =3D 0; - - *buf =3D '\0'; - while (get_next_image_info(0, &c, &ii) =3D=3D B_OK) { - if (ii.type =3D=3D B_APP_IMAGE) { - strncpy(buf, ii.name, sizeof(buf)); - buf[sizeof(buf) - 1] =3D 0; - p =3D buf; - break; - } - } - } -#endif - /* If we don't have any way of figuring out the actual executable - location then try argv[0]. */ - if (!p && argv0) { - p =3D realpath(argv0, buf); - } - if (p) { - exec_dir =3D g_path_get_dirname(p); - } else { - exec_dir =3D CONFIG_BINDIR; - } -} - -const char *qemu_get_exec_dir(void) -{ - return exec_dir; -} - #ifdef CONFIG_LINUX static void sigbus_handler(int signal, siginfo_t *siginfo, void *ctx) #else /* CONFIG_LINUX */ diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 1e05c316b311..0371082d23b3 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -270,42 +270,6 @@ void qemu_set_tty_echo(int fd, bool echo) } } =20 -static const char *exec_dir; - -void qemu_init_exec_dir(const char *argv0) -{ - - char *p; - char buf[MAX_PATH]; - DWORD len; - - if (exec_dir) { - return; - } - - len =3D GetModuleFileName(NULL, buf, sizeof(buf) - 1); - if (len =3D=3D 0) { - return; - } - - buf[len] =3D 0; - p =3D buf + len - 1; - while (p !=3D buf && *p !=3D '\\') { - p--; - } - *p =3D 0; - if (access(buf, R_OK) =3D=3D 0) { - exec_dir =3D g_strdup(buf); - } else { - exec_dir =3D CONFIG_BINDIR; - } -} - -const char *qemu_get_exec_dir(void) -{ - return exec_dir; -} - int getpagesize(void) { SYSTEM_INFO system_info; --=20 2.35.1.693.g805e0a68082a