[PATCH] Ignore sgabios rom in case sercon is enabled.

[Gerd Hoffmann]

We don't want them both be active.

Signed-off-by: Gerd Hoffmann 
---
 src/optionroms.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/optionroms.c b/src/optionroms.c
index 092393a56c..a5ecd4cd11 100644
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -193,6 +193,11 @@ run_file_roms(const char *prefix, int isvga, u64 *sources)
         file = romfile_findprefix(prefix, file);
         if (!file)
             break;
+        if (strcmp(file->name, "vgaroms/sgabios.bin") == 0 &&
+            CONFIG_SERCON && romfile_loadint("etc/sercon-port", 0)) {
+            dprintf(1, "sercon: is enabled, not loading sgabios rom.\n");
+            continue;
+        }
         struct rom_header *rom = deploy_romfile(file);
         if (rom) {
             setRomSource(sources, rom, (u32)file);

[Peter Stuge]

Gerd Hoffmann wrote:
> +++ b/src/optionroms.c
> @@ -193,6 +193,11 @@ run_file_roms(const char *prefix, int isvga, u64 *sources)
>          file = romfile_findprefix(prefix, file);
>          if (!file)
>              break;
>    if (strcmp(file->name, "vgaroms/sgabios.bin") == 0 &&
>        CONFIG_SERCON && romfile_loadint("etc/sercon-port", 0)) {
>        dprintf(1, "sercon: is enabled, not loading sgabios rom.\n");
>        continue;
>    }

This heuristic isn't very reliable. Is there nothing in the sgabios.bin
option ROM itself that can be used instead?

//Peter

[Paolo Bonzini]

On 04/11/2017 11:09, Peter Stuge wrote:
> >    if (strcmp(file->name, "vgaroms/sgabios.bin") == 0 &&
> >        CONFIG_SERCON && romfile_loadint("etc/sercon-port", 0)) {
> >        dprintf(1, "sercon: is enabled, not loading sgabios rom.\n");
> >        continue;
> >    }
>
> This heuristic isn't very reliable. Is there nothing in the sgabios.bin
> option ROM itself that can be used instead?

In what sense it is not very reliable?

Paolo