From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:46049)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1TCTXa-000552-1G
	for qemu-devel@nongnu.org; Fri, 14 Sep 2012 06:54:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1TCTXT-0001U4-UH
	for qemu-devel@nongnu.org; Fri, 14 Sep 2012 06:54:29 -0400
Received: from mail-ie0-f173.google.com ([209.85.223.173]:35604)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1TCTXT-0001Tu-PU
	for qemu-devel@nongnu.org; Fri, 14 Sep 2012 06:54:23 -0400
Received: by iebc10 with SMTP id c10so6148245ieb.4
	for <qemu-devel@nongnu.org>; Fri, 14 Sep 2012 03:54:22 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <acfe7fdf533c832a1428360895fa7868a5a15d4d.1347561356.git.jbaron@redhat.com>
References: <cover.1347561356.git.jbaron@redhat.com>
	<acfe7fdf533c832a1428360895fa7868a5a15d4d.1347561356.git.jbaron@redhat.com>
Date: Fri, 14 Sep 2012 11:54:22 +0100
Message-ID: <CAFEAcA8aCC7YJTwo3wa8N7jGgw80gSO9FO6LFs37q6f0NHGivA@mail.gmail.com>
From: Peter Maydell <peter.maydell@linaro.org>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH 24/25] Add a fallback bios file search,
	if -L fails.
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>
To: Jason Baron <jbaron@redhat.com>
Cc: aliguori@us.ibm.com, juzhang@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, agraf@suse.de, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, armbru@redhat.com

On 13 September 2012 21:12, Jason Baron <jbaron@redhat.com> wrote:
> If -L <dir> is specified, and qemu does not find the bios file in <dir>, then
> the search fails. Add infrastructure such that the search will continue in
> the default paths, if not found in the -L path.

> @@ -1872,12 +1873,15 @@ static int balloon_parse(const char *arg)
>      return -1;
>  }
>
> -char *qemu_find_file(int type, const char *name)
> +static char *__qemu_find_file(int type, const char *name, const char *dir)
>  {
>      int len;
>      const char *subdir;
>      char *buf;
>
> +    if (!dir)
> +        return NULL;
> +
>      /* Try the name as a straight path first */
>      if (access(name, R_OK) == 0) {
>          return g_strdup(name);

This means that every try with a different directory will
check the name as a straight path again, which is a bit
pointless. The "just try the name" code shouldn't be in
this function (which as Paolo suggests should be named
qemu_find_file_in_dir()), it should be pulled out into
your new qemu_find_file(), which will then look like:
 * try as plain pathname
 * try in directory 1
 * try in directory 2

-- PMM