[Qemu-devel] [PATCH] qemu_find_file: check name as a straight path even if it has no '/'

[Peter Maydell]

Make qemu_find_file() check for the passed in name as a straight
pathname even if it doesn't have any path separator character in it.
This means that "-bios foo", "-dtb foo" etc will find a file 'foo'
in the current directory.
This removes an inconsistency with -kernel and -initrd, which both
accept plain filenames as meaning files in the current directory.
It's also less confusing for the user than an undocumented restriction
that "this option accepts a filename, except for the special case
where the filename you pass happens not to have a '/' in it, in
which case we'll ignore it."

Signed-off-by: Peter Maydell <address@hidden>
---
 vl.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/vl.c b/vl.c
index 23ab3a3..4639526 100644
--- a/vl.c
+++ b/vl.c
@@ -1801,9 +1801,8 @@ char *qemu_find_file(int type, const char *name)
     const char *subdir;
     char *buf;
 
-    /* If name contains path separators then try it as a straight path.  */
-    if ((strchr(name, '/') || strchr(name, '\\'))
-        && access(name, R_OK) == 0) {
+    /* Try the name as a straight path first */
+    if (access(name, R_OK) == 0) {
         return g_strdup(name);
     }
     switch (type) {
-- 
1.7.1