From nobody Sun Nov 16 14:30:25 2025 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=1600533464; cv=none; d=zohomail.com; s=zohoarc; b=GcFV3U34KhAg8+8e98pJfLkk7VS+aH/2zcwDfKOLMBBmzn1JUEFxqOr7q+d/fmHwktM4FJ58wYC4M5ZhZ+Xo3P7uzep/bQXuyErAUTSod+uRQ8Oe5zIs6TtZp+7HRJUWL9MGoISXOZCpgn3/AcqPo11W/DsfVYsLn9L+CU2V6MY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600533464; h=Content-Type:Content-Transfer-Encoding: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=t66UYdSA+NP80TVHGPpMrwUuOQD1zSBwmCRzpom03PM=; b=lh5h6JXVsW6dgtC1IVUpzrUMPvUxIJevBoZM62ehKcvlaj6c/M5OiOFEU+2zxUEHYEcAieN8Su0+HB27Qwh7Wmjry5VmGG7CavoGTtujINHW9nhfOd/5aH+WItIGsiKCqFC6CPYZnYQjlwOmTYz21Rlo9yepYelm9TL1Ackf7Qk= 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 1600533464300720.6008728146729; Sat, 19 Sep 2020 09:37:44 -0700 (PDT) Received: from localhost ([::1]:54486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJfrl-0002Tb-F1 for importer@patchew.org; Sat, 19 Sep 2020 12:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJfHV-0005Zk-T8 for qemu-devel@nongnu.org; Sat, 19 Sep 2020 12:00:09 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:24972 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJfHG-0007Rv-Qd for qemu-devel@nongnu.org; Sat, 19 Sep 2020 12:00:09 -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-274-6a3pQneTNUmCthzC-E7kLg-1; Sat, 19 Sep 2020 11:59:51 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5D7F88EF06 for ; Sat, 19 Sep 2020 15:59:50 +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 A43455576A for ; Sat, 19 Sep 2020 15:59:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600531193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t66UYdSA+NP80TVHGPpMrwUuOQD1zSBwmCRzpom03PM=; b=bGC//hwEmqctCQhIlwO2mQpU1YcE7uH2rAiqKupTaivN00AfooffnpickEQW9WQIZ30zj5 T7fRZGhXgQDs+gbWlrrN0oE84RYzbOZkPeNkO3AKo/7wGc/NdF5MME2uMUjWhZJ8eHCv3O xRWgNGyi52vAE2dyl/3UJiAO4zTi3qc= X-MC-Unique: 6a3pQneTNUmCthzC-E7kLg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 46/57] module: relocate path to modules Date: Sat, 19 Sep 2020 11:59:05 -0400 Message-Id: <20200919155916.1046398-47-pbonzini@redhat.com> In-Reply-To: <20200919155916.1046398-1-pbonzini@redhat.com> References: <20200919155916.1046398-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 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=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 06:12:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, 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_H2=-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: , 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" Signed-off-by: Paolo Bonzini --- util/module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/module.c b/util/module.c index 9ffe83bb32..a44ec38d93 100644 --- a/util/module.c +++ b/util/module.c @@ -19,6 +19,7 @@ #endif #include "qemu/queue.h" #include "qemu/module.h" +#include "qemu/cutils.h" #ifdef CONFIG_MODULE_UPGRADES #include "qemu-version.h" #endif @@ -202,7 +203,7 @@ bool module_load_one(const char *prefix, const char *li= b_name) if (search_dir !=3D NULL) { dirs[n_dirs++] =3D g_strdup_printf("%s", search_dir); } - dirs[n_dirs++] =3D g_strdup_printf("%s", CONFIG_QEMU_MODDIR); + dirs[n_dirs++] =3D get_relocated_path(CONFIG_QEMU_MODDIR); dirs[n_dirs++] =3D g_strdup(qemu_get_exec_dir()); =20 #ifdef CONFIG_MODULE_UPGRADES --=20 2.26.2