Message ID | 9ca2ad159f27ffc4b108a1058718d2c7c13b3e7c.1349749915.git.jbaron@redhat.com |
---|---|
State | New |
Headers | show |
Il 09/10/2012 05:30, Jason Baron ha scritto: > From: Jason Baron <jbaron@redhat.com> > > 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. > > Signed-off-by: Jason Baron <jbaron@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> > --- > vl.c | 36 +++++++++++++++++++++++++----------- > 1 files changed, 25 insertions(+), 11 deletions(-) > > diff --git a/vl.c b/vl.c > index 77af809..704cff9 100644 > --- a/vl.c > +++ b/vl.c > @@ -177,6 +177,7 @@ int main(int argc, char **argv) > #define MAX_VIRTIO_CONSOLES 1 > > static const char *data_dir; > +static const char *data_dir_fallback; > const char *bios_name = NULL; > enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; > DisplayType display_type = DT_DEFAULT; > @@ -1882,16 +1883,16 @@ static int balloon_parse(const char *arg) > return -1; > } > > -char *qemu_find_file(int type, const char *name) > +static char *qemu_find_file_in_dir(int type, const char *name, const char *dir) > { > int len; > const char *subdir; > char *buf; > > - /* Try the name as a straight path first */ > - if (access(name, R_OK) == 0) { > - return g_strdup(name); > + if (!dir) { > + return NULL; > } > + > switch (type) { > case QEMU_FILE_TYPE_BIOS: > subdir = ""; > @@ -1902,9 +1903,9 @@ char *qemu_find_file(int type, const char *name) > default: > abort(); > } > - len = strlen(data_dir) + strlen(name) + strlen(subdir) + 2; > + len = strlen(dir) + strlen(name) + strlen(subdir) + 2; > buf = g_malloc0(len); > - snprintf(buf, len, "%s/%s%s", data_dir, subdir, name); > + snprintf(buf, len, "%s/%s%s", dir, subdir, name); > if (access(buf, R_OK)) { > g_free(buf); > return NULL; > @@ -1912,6 +1913,21 @@ char *qemu_find_file(int type, const char *name) > return buf; > } > > +char *qemu_find_file(int type, const char *name) > +{ > + char *filename; > + > + /* Try the name as a straight path first */ > + if (access(name, R_OK) == 0) { > + return g_strdup(name); > + } > + filename = qemu_find_file_in_dir(type, name, data_dir); > + if (!filename) { > + filename = qemu_find_file_in_dir(type, name, data_dir_fallback); > + } > + return filename; > +} > + > static int device_help_func(QemuOpts *opts, void *opaque) > { > return qdev_device_help(opts); > @@ -3349,12 +3365,10 @@ int main(int argc, char **argv, char **envp) > > /* If no data_dir is specified then try to find it relative to the > executable path. */ > - if (!data_dir) { > - data_dir = os_find_datadir(argv[0]); > - } > + data_dir_fallback = os_find_datadir(argv[0]); > /* If all else fails use the install path specified when building. */ > - if (!data_dir) { > - data_dir = CONFIG_QEMU_DATADIR; > + if (!data_dir_fallback) { > + data_dir_fallback = CONFIG_QEMU_DATADIR; > } > > /* >
diff --git a/vl.c b/vl.c index 77af809..704cff9 100644 --- a/vl.c +++ b/vl.c @@ -177,6 +177,7 @@ int main(int argc, char **argv) #define MAX_VIRTIO_CONSOLES 1 static const char *data_dir; +static const char *data_dir_fallback; const char *bios_name = NULL; enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; DisplayType display_type = DT_DEFAULT; @@ -1882,16 +1883,16 @@ static int balloon_parse(const char *arg) return -1; } -char *qemu_find_file(int type, const char *name) +static char *qemu_find_file_in_dir(int type, const char *name, const char *dir) { int len; const char *subdir; char *buf; - /* Try the name as a straight path first */ - if (access(name, R_OK) == 0) { - return g_strdup(name); + if (!dir) { + return NULL; } + switch (type) { case QEMU_FILE_TYPE_BIOS: subdir = ""; @@ -1902,9 +1903,9 @@ char *qemu_find_file(int type, const char *name) default: abort(); } - len = strlen(data_dir) + strlen(name) + strlen(subdir) + 2; + len = strlen(dir) + strlen(name) + strlen(subdir) + 2; buf = g_malloc0(len); - snprintf(buf, len, "%s/%s%s", data_dir, subdir, name); + snprintf(buf, len, "%s/%s%s", dir, subdir, name); if (access(buf, R_OK)) { g_free(buf); return NULL; @@ -1912,6 +1913,21 @@ char *qemu_find_file(int type, const char *name) return buf; } +char *qemu_find_file(int type, const char *name) +{ + char *filename; + + /* Try the name as a straight path first */ + if (access(name, R_OK) == 0) { + return g_strdup(name); + } + filename = qemu_find_file_in_dir(type, name, data_dir); + if (!filename) { + filename = qemu_find_file_in_dir(type, name, data_dir_fallback); + } + return filename; +} + static int device_help_func(QemuOpts *opts, void *opaque) { return qdev_device_help(opts); @@ -3349,12 +3365,10 @@ int main(int argc, char **argv, char **envp) /* If no data_dir is specified then try to find it relative to the executable path. */ - if (!data_dir) { - data_dir = os_find_datadir(argv[0]); - } + data_dir_fallback = os_find_datadir(argv[0]); /* If all else fails use the install path specified when building. */ - if (!data_dir) { - data_dir = CONFIG_QEMU_DATADIR; + if (!data_dir_fallback) { + data_dir_fallback = CONFIG_QEMU_DATADIR; } /*