From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MKT0a-000432-05 for qemu-devel@nongnu.org; Sat, 27 Jun 2009 04:11:36 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MKT0V-00040w-Cv for qemu-devel@nongnu.org; Sat, 27 Jun 2009 04:11:35 -0400 Received: from [199.232.76.173] (port=47106 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MKT0V-00040n-7X for qemu-devel@nongnu.org; Sat, 27 Jun 2009 04:11:31 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:55814) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MKT0U-00010P-OT for qemu-devel@nongnu.org; Sat, 27 Jun 2009 04:11:31 -0400 Message-ID: <4A45D431.80006@web.de> Date: Sat, 27 Jun 2009 10:11:29 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig3793B7627799F38B0A8C3548" Sender: jan.kiszka@web.de Subject: [Qemu-devel] [RESEND][PATCH 2/2] qemu: 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) --------------enig3793B7627799F38B0A8C3548 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable [ Note: Applies on top of qemu's current patch series. ] 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 | 11 +++++++++++ bios/rombios32.c | 10 ---------- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/bios/rombios.c b/bios/rombios.c index 0f13b53..3b7a5f0 100644 --- a/bios/rombios.c +++ b/bios/rombios.c @@ -2015,6 +2015,21 @@ Bit16u i; ipl_entry_t *e; } =20 #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_INTERACTIVE); + 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; =20 +#ifdef BX_QEMU + if (!qemu_cfg_probe_bootkey()) return; +#endif + while (check_for_keystroke()) get_keystroke(); =20 diff --git a/bios/rombios.h b/bios/rombios.h index 6f9cbb1..038b4a0 100644 --- a/bios/rombios.h +++ b/bios/rombios.h @@ -58,6 +58,17 @@ #define SMB_IO_BASE 0xb100 #define SMP_MSR_ADDR 0x0510 =20 +#define QEMU_CFG_CTL_PORT 0x510 +#define QEMU_CFG_DATA_PORT 0x511 +#define QEMU_CFG_SIGNATURE 0x00 +#define QEMU_CFG_ID 0x01 +#define QEMU_CFG_UUID 0x02 +#define QEMU_CFG_NUMA 0x0d +#define QEMU_CFG_BOOT_INTERACTIVE 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) + // Define the application NAME #if defined(BX_QEMU) # define BX_APPNAME "QEMU" diff --git a/bios/rombios32.c b/bios/rombios32.c index f861f81..3fe4e48 100644 --- a/bios/rombios32.c +++ b/bios/rombios32.c @@ -468,16 +468,6 @@ void wrmsr_smp(uint32_t index, uint64_t val) } =20 #ifdef BX_QEMU -#define QEMU_CFG_CTL_PORT 0x510 -#define QEMU_CFG_DATA_PORT 0x511 -#define QEMU_CFG_SIGNATURE 0x00 -#define QEMU_CFG_ID 0x01 -#define QEMU_CFG_UUID 0x02 -#define QEMU_CFG_NUMA 0x0D -#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) - int qemu_cfg_port; =20 void qemu_cfg_select(int f) --------------enig3793B7627799F38B0A8C3548 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 iEYEARECAAYFAkpF1DEACgkQniDOoMHTA+n+VwCfX0uvKp4w6YQxcM7bKFZ7+G04 QhwAn2qju03+k4kzCeeSfwJcsG98oltf =7ASa -----END PGP SIGNATURE----- --------------enig3793B7627799F38B0A8C3548--