[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 19/21] Add a fallback bios file search, if -L
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v2 19/21] Add a fallback bios file search, if -L fails. |
Date: |
Tue, 09 Oct 2012 09:59:45 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 |
Il 09/10/2012 05:30, Jason Baron ha scritto:
> From: Jason Baron <address@hidden>
>
> 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 <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
> ---
> 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;
> }
>
> /*
>
- Re: [Qemu-devel] [PATCH v2 11/21] pcie: Convert PCIExpressHost to use the QOM., (continued)
- [Qemu-devel] [PATCH v2 07/21] pc/piix_pci: factor out smram/pam logic, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 14/21] q35: Suppress SMM BIOS initialization under KVM, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 17/21] q35: Add kvmclock support, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 15/21] q35: Fix non-PCI IRQ processing in ich9_lpc_update_apic, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 19/21] Add a fallback bios file search, if -L fails., Jason Baron, 2012/10/08
- Re: [Qemu-devel] [PATCH v2 19/21] Add a fallback bios file search, if -L fails.,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 16/21] q35: smbus: Remove PCI_STATUS_SIG_SYSTEM_ERROR and PCI_STATUS_DETECTED_PARITY from w1cmask, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 18/21] q35: Fix irr initialization for slots 25..31, Jason Baron, 2012/10/08
- [Qemu-devel] [PATCH v2 12/21] q35: Introduce q35 pc based chipset emulator, Jason Baron, 2012/10/08