Patchwork Check rom_load_all() return value.

login
register
mail settings
Submitter Gerd Hoffmann
Date Dec. 14, 2009, 11:08 a.m.
Message ID <1260788938-20864-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/41084/
State New
Headers show

Comments

Gerd Hoffmann - Dec. 14, 2009, 11:08 a.m.
... otherwise we'll continue without the bios loaded in case the
option roms don't fit.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 vl.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
Anthony Liguori - Dec. 14, 2009, 2:39 p.m.
Gerd Hoffmann wrote:
> ... otherwise we'll continue without the bios loaded in case the
> option roms don't fit.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  vl.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index c0d98f5..1682808 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -6031,7 +6031,10 @@ int main(int argc, char **argv, char **envp)
>  
>      qdev_machine_creation_done();
>  
> -    rom_load_all();
> +    if (rom_load_all() != 0) {
> +        fprintf(stderr, "rom loading failed\n");
> +        exit(1);
> +    }
>   

Failing to load option roms shouldn't be treated as a critical failure.  
The BIOS has dedicated space so no amount of option roms should prevent 
the BIOS from loading.

So I think we may need to tweak rom_load_all() a bit to be more 
intelligent about handling this.

Regards,

Anthony Liguori

Patch

diff --git a/vl.c b/vl.c
index c0d98f5..1682808 100644
--- a/vl.c
+++ b/vl.c
@@ -6031,7 +6031,10 @@  int main(int argc, char **argv, char **envp)
 
     qdev_machine_creation_done();
 
-    rom_load_all();
+    if (rom_load_all() != 0) {
+        fprintf(stderr, "rom loading failed\n");
+        exit(1);
+    }
 
     qemu_system_reset();
     if (loadvm) {