Message ID | 1534870966-9287-50-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nrwGxrPE"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vydQ6RkHz9s3x for <incoming@patchwork.ozlabs.org>; Wed, 22 Aug 2018 03:40:58 +1000 (AEST) Received: from localhost ([::1]:55139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fsAeG-0003vJ-Fn for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:40:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4h-0002C1-Eb for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4W-0006pN-Qo for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:05 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:36375) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4V-0006h5-Rd for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:00 -0400 Received: by mail-wr1-x42a.google.com with SMTP id m27-v6so10236161wrf.3 for <qemu-devel@nongnu.org>; Tue, 21 Aug 2018 10:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e+AVb+CjmVXzZVKiSiFYCADawkt5crQpWTQUtZGCNtg=; b=nrwGxrPEG9pGC56OwBxsZwCr7cWIZPCHCleZCxoeCgJwnZgMSvod46kxGsWeQEQylv FV/hwD5VdJfN2fnHmYYT+1A+rHgXYK+b6ybcx+PiDFuxvCDPLXz1WuFSzVds3oneHcDN 3LRPWXkyPHc194wgT4luW0rK3NDFUe9eV75UfKmiASRskxYHjQ6/kEFTTywW1NmneHjp csGljbppTkQe15pPj7iBWtV8TalcZh3P4TgAjHrwldl4FXJSI95ISKuXrfrb+8pfn/9E whSu+giyaWy7NGSmcg1EM1bxd+vAhwtatxUj9ldpdZ7amnKHScWY+PXaMdfgfOcoPOfQ uufw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=e+AVb+CjmVXzZVKiSiFYCADawkt5crQpWTQUtZGCNtg=; b=Q1ccKyjx5oCZNwZUX6e+W7Z6fCCWJeWL9h00iGYLko5632Siw5JraNQJBwp5rQx9aK ezqEIn975f1aScJFciALwCztQc1nE6u3Jz6kvNvqLj4FAkn+dMlcwJ7wzhFglO2yfII8 gcmETLKpE7uiiRctkfk14XSdcY1b9FtFiQAgFVG55AC8ROOPApQtrH0lFYgfKsNDgosq c+e9D6Xfv0L6TwZsU4zVnTjUSsgaNPs4nE8enEr5vozzbEqrusJbVdzZsYY151MgYsr/ driU3mQUBWaroO+3kIhgJwKQZ0Xh8L6j7LWJ9W2A1N2MspOXcXemo3Wb7PIpBRn/KG2S goYg== X-Gm-Message-State: APzg51A/vqaNg/pgcZuJlqX9w9TTXQMSR42jFUBvELxvmQCW198apxy7 cITyv/FsuGt2/9m/ee5cS1RJrDQB X-Google-Smtp-Source: ANB0VdZfhQd6qVkvG3UB14z9R/We1tF4P1tOuCE3oINrBERkIkkekU68r/43Vsvdv3bmAS7WBzu6qw== X-Received: by 2002:adf:a292:: with SMTP id s18-v6mr8814209wra.100.1534871036356; Tue, 21 Aug 2018 10:03:56 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:55 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:21 +0200 Message-Id: <1534870966-9287-50-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 49/74] module: Use QEMU_MODULE_DIR as a search path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: ryang <decatf@gmail.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/74] tests: virtio: separate ccw tests from libqos
|
expand
|
diff --git a/util/module.c b/util/module.c index c909737..1259dd3 100644 --- a/util/module.c +++ b/util/module.c @@ -162,9 +162,10 @@ void module_load_one(const char *prefix, const char *lib_name) #ifdef CONFIG_MODULES char *fname = NULL; char *exec_dir; - char *dirs[3]; + const char *search_dir; + char *dirs[4]; char *module_name; - int i = 0; + int i = 0, n_dirs = 0; int ret; static GHashTable *loaded_modules; @@ -186,14 +187,19 @@ void module_load_one(const char *prefix, const char *lib_name) g_hash_table_insert(loaded_modules, module_name, module_name); exec_dir = qemu_get_exec_dir(); - dirs[i++] = g_strdup_printf("%s", CONFIG_QEMU_MODDIR); - dirs[i++] = g_strdup_printf("%s/..", exec_dir ? : ""); - dirs[i++] = g_strdup_printf("%s", exec_dir ? : ""); - assert(i == ARRAY_SIZE(dirs)); + search_dir = getenv("QEMU_MODULE_DIR"); + if (search_dir != NULL) { + dirs[n_dirs++] = g_strdup_printf("%s", search_dir); + } + dirs[n_dirs++] = g_strdup_printf("%s", CONFIG_QEMU_MODDIR); + dirs[n_dirs++] = g_strdup_printf("%s/..", exec_dir ? : ""); + dirs[n_dirs++] = g_strdup_printf("%s", exec_dir ? : ""); + assert(n_dirs <= ARRAY_SIZE(dirs)); + g_free(exec_dir); exec_dir = NULL; - for (i = 0; i < ARRAY_SIZE(dirs); i++) { + for (i = 0; i < n_dirs; i++) { fname = g_strdup_printf("%s/%s%s", dirs[i], module_name, HOST_DSOSUF); ret = module_load_file(fname); @@ -205,7 +211,7 @@ void module_load_one(const char *prefix, const char *lib_name) } } - for (i = 0; i < ARRAY_SIZE(dirs); i++) { + for (i = 0; i < n_dirs; i++) { g_free(dirs[i]); }