From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MM81v-00074u-Ia for qemu-devel@nongnu.org; Wed, 01 Jul 2009 18:11:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MM81q-00072R-BV for qemu-devel@nongnu.org; Wed, 01 Jul 2009 18:11:50 -0400 Received: from [199.232.76.173] (port=39650 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MM81q-00072J-3V for qemu-devel@nongnu.org; Wed, 01 Jul 2009 18:11:46 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:54415) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MM81p-0004X8-GV for qemu-devel@nongnu.org; Wed, 01 Jul 2009 18:11:45 -0400 Message-ID: <4A4BDF20.8000203@web.de> Date: Thu, 02 Jul 2009 00:11:44 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig6E36EBF4A511A0BB37E0ED5A" Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH 2/2] bochs-bios: Make boot prompt optional List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: bochs developers , qemu-devel This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig6E36EBF4A511A0BB37E0ED5A Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable 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 --- bios/rombios.c | 19 +++++++++++++++++++ bios/rombios.h | 1 + 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/bios/rombios.c b/bios/rombios.c index 0f13b53..560e6d5 100644 --- a/bios/rombios.c +++ b/bios/rombios.c @@ -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) !=3D 'Q' || + inb(QEMU_CFG_DATA_PORT) !=3D 'E' || + inb(QEMU_CFG_DATA_PORT) !=3D 'M' || + inb(QEMU_CFG_DATA_PORT) !=3D '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 =3D get_SS(); Bit16u valid_choice =3D 0; +#ifdef BX_QEMU + if (!qemu_cfg_probe_bootkey()) return; +#endif + while (check_for_keystroke()) get_keystroke(); diff --git a/bios/rombios.h b/bios/rombios.h index 59ce19d..8ece2ee 100644 --- a/bios/rombios.h +++ b/bios/rombios.h @@ -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) --------------enig6E36EBF4A511A0BB37E0ED5A Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkpL3yAACgkQniDOoMHTA+kh9wCcDxzozmERT9jYbwld12le+Xuv sGsAnAgLNLM5TqorvY+xRhuaqqEQH1Zw =SPuA -----END PGP SIGNATURE----- --------------enig6E36EBF4A511A0BB37E0ED5A--