diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2017-11-10 12:20:35 -0500 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-03-19 10:10:55 +0100 |
| commit | 0551a4be2ce599fb60e478b4c15e06ab6587822c (patch) | |
| tree | c5faa0fc70e33c82324455a4dde0d6ac40b51e7d | |
| parent | a7aa43e97e97904531499f85e0d7517105f5b96d (diff) | |
| download | seabios-0551a4be2ce599fb60e478b4c15e06ab6587822c.tar.gz | |
paravirt: Only enable sercon in NOGRAPHIC mode if no other console specifiedrel-1.11.1
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
(cherry picked from commit 0541f2f0f246e77d7c726926976920e8072d1119)
| -rw-r--r-- | src/fw/paravirt.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/fw/paravirt.c b/src/fw/paravirt.c index 9674ab8b..0770c47b 100644 --- a/src/fw/paravirt.c +++ b/src/fw/paravirt.c @@ -513,12 +513,6 @@ qemu_cfg_legacy(void) qemu_romfile_add("etc/irq0-override", QEMU_CFG_IRQ0_OVERRIDE, 0, 1); qemu_romfile_add("etc/max-cpus", QEMU_CFG_MAX_CPUS, 0, 2); - // serial console - u16 nogfx = 0; - qemu_cfg_read_entry(&nogfx, QEMU_CFG_NOGRAPHIC, sizeof(nogfx)); - if (nogfx) - const_romfile_add_int("etc/sercon-port", PORT_SERIAL1); - // NUMA data u64 numacount; qemu_cfg_read_entry(&numacount, QEMU_CFG_NUMA, sizeof(numacount)); @@ -620,4 +614,11 @@ void qemu_cfg_init(void) acpi_pm_base = 0x0600; dprintf(1, "Moving pm_base to 0x%x\n", acpi_pm_base); } + + // serial console + u16 nogfx = 0; + qemu_cfg_read_entry(&nogfx, QEMU_CFG_NOGRAPHIC, sizeof(nogfx)); + if (nogfx && !romfile_find("etc/sercon-port") + && !romfile_find("vgaroms/sgabios.bin")) + const_romfile_add_int("etc/sercon-port", PORT_SERIAL1); } |