From nobody Tue Feb 10 03:37:22 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598941380; cv=none; d=zohomail.com; s=zohoarc; b=jjfD2kt9ChErT38qeNbBQyYUbAgKhykUxCnOEhyhb8F+Y2vYWoRQk+S8HOHVNC2/yPsV0jt/s7GuvL4k7SYjWe8skTKmLAdhts0iYW/B1zhUOscSl1QizJK1pKb4y5GZJvvr6u0Evj7608jw5s3nFHs8tJ133+aYpSFiOeIbbJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598941380; h=Content-Type: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:To; bh=VFTSKgbtfOAZ0MhoeAhMnWBNPjjt3/Q0xsLFhvDTcA8=; b=WgqkOuy0iDj7DEVwCz7AuOPFjyo0w3cZ7QLy1NnAMuvs0xfvd0uN9geOZAZaadMarWoe/aiagRFhMqbCEMnCHWA4kstpaW8A9Bq9wlAkOK9oyJNaAYt5w1DbdL1kSNG5m6wpiq73uR9IypgHhvswZW+a0PvHwxcp+WKINSIsNTU= 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598941380574980.2188281663883; Mon, 31 Aug 2020 23:23:00 -0700 (PDT) Received: from localhost ([::1]:35576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCzh5-0002Vc-OA for importer@patchew.org; Tue, 01 Sep 2020 02:22:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCzef-00062H-Oc for qemu-devel@nongnu.org; Tue, 01 Sep 2020 02:20:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCzed-0000me-PV for qemu-devel@nongnu.org; Tue, 01 Sep 2020 02:20:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-151-ftj5EehnPvqSuh8ElIiUSA-1; Tue, 01 Sep 2020 02:20:23 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B9FD801AC5; Tue, 1 Sep 2020 06:20:22 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 184401002D4E; Tue, 1 Sep 2020 06:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598941226; 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=VFTSKgbtfOAZ0MhoeAhMnWBNPjjt3/Q0xsLFhvDTcA8=; b=MvMm+F0g+V96wFaazpJgyNSRryIhzy0D0nqHbjyOtFGzP4bCK5l+t99SoIVBfqRb45UMPt asxecdxloS9+e5aFFnLSNEI06ly5bmEuHs3Nfgfxy/QDKEieJcENpSflzAYGab2TruGC+6 Hkz+8kQ5Je/o4sa4RjXnTB8pC7AM6gw= X-MC-Unique: ftj5EehnPvqSuh8ElIiUSA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/13] oslib-posix: default exec_dir to bindir Date: Tue, 1 Sep 2020 02:20:10 -0400 Message-Id: <20200901062020.26660-4-pbonzini@redhat.com> In-Reply-To: <20200901062020.26660-1-pbonzini@redhat.com> References: <20200901062020.26660-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 01:27:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" If the exec_dir cannot be retrieved, just assume it's the installation directory that was specified at configure time. This makes it simpler to reason about what the callers will do if they get back an empty path. Signed-off-by: Paolo Bonzini --- meson.build | 2 +- util/oslib-posix.c | 23 ++++++++--------------- util/oslib-win32.c | 2 ++ 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build index 93182d36e3..10ab189bc5 100644 --- a/meson.build +++ b/meson.build @@ -415,7 +415,7 @@ config_host_data.set('QEMU_VERSION_MINOR', meson.projec= t_version().split('.')[1] config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('= .')[2]) =20 arrays =3D ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BD= RV_RO_WHITELIST'] -strings =3D ['HOST_DSOSUF', 'CONFIG_IASL', 'qemu_confdir', 'qemu_datadir', +strings =3D ['HOST_DSOSUF', 'CONFIG_IASL', 'bindir', 'qemu_confdir', 'qemu= _datadir', 'qemu_moddir', 'qemu_localstatedir', 'qemu_helperdir', 'qemu_lo= caledir', 'qemu_icondir', 'qemu_desktopdir', 'qemu_firmwarepath'] foreach k, v: config_host diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 0dd8d24076..a68fccb52d 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -358,15 +358,14 @@ void qemu_set_tty_echo(int fd, bool echo) tcsetattr(fd, TCSANOW, &tty); } =20 -static char exec_dir[PATH_MAX]; +static char *exec_dir; =20 void qemu_init_exec_dir(const char *argv0) { - char *dir; char *p =3D NULL; char buf[PATH_MAX]; =20 - if (exec_dir[0]) { + if (exec_dir) { return; } =20 @@ -425,20 +424,14 @@ void qemu_init_exec_dir(const char *argv0) #endif /* If we don't have any way of figuring out the actual executable location then try argv[0]. */ - if (!p) { - if (!argv0) { - return; - } + if (!p && argv0) { p =3D realpath(argv0, buf); - if (!p) { - return; - } } - dir =3D g_path_get_dirname(p); - - pstrcpy(exec_dir, sizeof(exec_dir), dir); - - g_free(dir); + if (p) { + exec_dir =3D g_path_get_dirname(p); + } else { + exec_dir =3D g_strdup(CONFIG_BINDIR); + } } =20 const char *qemu_get_exec_dir(void) diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 1a33912944..8d3f940a54 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -341,6 +341,8 @@ void qemu_init_exec_dir(const char *argv0) *p =3D 0; if (access(buf, R_OK) =3D=3D 0) { exec_dir =3D g_strdup(buf); + } else { + exec_dir =3D g_strdup(CONFIG_BINDIR); } } =20 --=20 2.26.2