bochs-bios: Make boot prompt optional
PATCH 2/2 bochs-bios: Make boot prompt optional
Check via QEMU's firmware configuration interface if the boot prompt should be given. This allows to disable the prompt with its several seconds long delay, speeding up the common boot case.
Signed-off-by Jan Kiszka <[email protected]>
---
bios/rombios.c | 19 +++++++++++++++++++ bios/rombios.h | 1 + 2 files changed, 20 insertions(+), 0 deletions(-)
bios/rombios.c +19 -0
@@ -2015,6 +2015,21 @@ Bit16u i; ipl_entry_t *e; }#if BX_ELTORITO_BOOT +#ifdef BX_QEMU +int +qemu_cfg_probe_bootkey () +{ +outw (QEMU_CFG_CTL_PORT ,QEMU_CFG_SIGNATURE ); +if (inb (QEMU_CFG_DATA_PORT ) !='Q' || +inb (QEMU_CFG_DATA_PORT ) !='E' || +inb (QEMU_CFG_DATA_PORT ) !='M' || +inb (QEMU_CFG_DATA_PORT ) !='U' )return 1 ; + +outw (QEMU_CFG_CTL_PORT ,QEMU_CFG_BOOT_MENU ); +return inb (QEMU_CFG_DATA_PORT ); +} +#endif // BX_QEMU +void interactive_bootkey () {
@@ -2026,6 +2041,10 @@ interactive_bootkey()Bit16u ss =get_SS ();Bit16u valid_choice =0 ; +#ifdef BX_QEMU +if (!qemu_cfg_probe_bootkey ())return ; +#endif +while (check_for_keystroke ())get_keystroke ();
bios/rombios.h +1 -0
@@ -64,6 +64,7 @@#define QEMU_CFG_ID 0x01#define QEMU_CFG_UUID 0x02#define QEMU_CFG_NUMA 0x0d +#define QEMU_CFG_BOOT_MENU 0x0e#define QEMU_CFG_ARCH_LOCAL 0x8000#define QEMU_CFG_ACPI_TABLES (QEMU_CFG_ARCH_LOCAL + 0)#define QEMU_CFG_SMBIOS_ENTRIES (QEMU_CFG_ARCH_LOCAL + 1)