From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MM81t-00073m-A0 for qemu-devel@nongnu.org; Wed, 01 Jul 2009 18:11:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MM81o-00071n-KQ for qemu-devel@nongnu.org; Wed, 01 Jul 2009 18:11:48 -0400 Received: from [199.232.76.173] (port=39647 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MM81o-00071i-BT for qemu-devel@nongnu.org; Wed, 01 Jul 2009 18:11:44 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:47516) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MM81n-0004Wo-PR for qemu-devel@nongnu.org; Wed, 01 Jul 2009 18:11:44 -0400 Message-ID: <4A4BDF1A.5010007@web.de> Date: Thu, 02 Jul 2009 00:11:38 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigAEE4A75902D62760CC62715B" Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH 1/2] bochs-bios: Move QEMU_CFG constants to rombios.h 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) --------------enigAEE4A75902D62760CC62715B Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable We will need them outside of rombios32.c. Signed-off-by: Jan Kiszka --- bios/rombios.h | 10 ++++++++++ bios/rombios32.c | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bios/rombios.h b/bios/rombios.h index 6f9cbb1..59ce19d 100644 --- a/bios/rombios.h +++ b/bios/rombios.h @@ -58,6 +58,16 @@ #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_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) --------------enigAEE4A75902D62760CC62715B 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 iEYEARECAAYFAkpL3x0ACgkQniDOoMHTA+mZTgCfUWaQKlKjUE7Dy1bzKvyxbVxQ kHQAmwVsVVNIlGNSgfXm32DKAsbiAYQS =dIyH -----END PGP SIGNATURE----- --------------enigAEE4A75902D62760CC62715B--