diff mbox series

[15/15] vl: remove bios_name

Message ID 20201026143028.3034018-16-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show
Series remove bios_name variable | expand

Commit Message

Paolo Bonzini Oct. 26, 2020, 2:30 p.m. UTC
bios_name was a legacy variable used by machine code, but it is
no more.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/sysemu/sysemu.h | 1 -
 softmmu/vl.c            | 2 --
 2 files changed, 3 deletions(-)

Comments

Alex Bennée Oct. 26, 2020, 5:30 p.m. UTC | #1
Paolo Bonzini <pbonzini@redhat.com> writes:

> bios_name was a legacy variable used by machine code, but it is
> no more.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

well it all built which is as far as I've tested it:

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Thomas Huth Oct. 27, 2020, 2:22 p.m. UTC | #2
On 26/10/2020 15.30, Paolo Bonzini wrote:
> bios_name was a legacy variable used by machine code, but it is
> no more.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  include/sysemu/sysemu.h | 1 -
>  softmmu/vl.c            | 2 --
>  2 files changed, 3 deletions(-)
> 
> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
> index 817ff4cf75..1336b4264a 100644
> --- a/include/sysemu/sysemu.h
> +++ b/include/sysemu/sysemu.h
> @@ -8,7 +8,6 @@
>  
>  /* vl.c */
>  
> -extern const char *bios_name;
>  extern int only_migratable;
>  extern const char *qemu_name;
>  extern QemuUUID qemu_uuid;
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index b7d7f43c88..7909709879 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -119,7 +119,6 @@
>  
>  static const char *data_dir[16];
>  static int data_dir_idx;
> -const char *bios_name = NULL;
>  enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
>  int display_opengl;
>  const char* keyboard_layout = NULL;
> @@ -4205,7 +4204,6 @@ void qemu_init(int argc, char **argv, char **envp)
>      kernel_filename = qemu_opt_get(machine_opts, "kernel");
>      initrd_filename = qemu_opt_get(machine_opts, "initrd");
>      kernel_cmdline = qemu_opt_get(machine_opts, "append");
> -    bios_name = qemu_opt_get(machine_opts, "firmware");
>  
>      opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
>      if (opts) {
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>
diff mbox series

Patch

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 817ff4cf75..1336b4264a 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -8,7 +8,6 @@ 
 
 /* vl.c */
 
-extern const char *bios_name;
 extern int only_migratable;
 extern const char *qemu_name;
 extern QemuUUID qemu_uuid;
diff --git a/softmmu/vl.c b/softmmu/vl.c
index b7d7f43c88..7909709879 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -119,7 +119,6 @@ 
 
 static const char *data_dir[16];
 static int data_dir_idx;
-const char *bios_name = NULL;
 enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
 int display_opengl;
 const char* keyboard_layout = NULL;
@@ -4205,7 +4204,6 @@  void qemu_init(int argc, char **argv, char **envp)
     kernel_filename = qemu_opt_get(machine_opts, "kernel");
     initrd_filename = qemu_opt_get(machine_opts, "initrd");
     kernel_cmdline = qemu_opt_get(machine_opts, "append");
-    bios_name = qemu_opt_get(machine_opts, "firmware");
 
     opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
     if (opts) {