pc-bios/bios-pq/0017-bochs-bios-Move-QEMU_CFG-constants-to-rombios.h.patch

   1 From f371c480cb93f3516f34af5e3a4524ee6ba43c24 Mon Sep 17 00:00:00 2001
   2 From: Jan Kiszka <jan.kiszka@web.de>
   3 Date: Thu, 2 Jul 2009 00:11:38 +0200
   4 Subject: [PATCH 1/2] bochs-bios: Move QEMU_CFG constants to rombios.h
   5
   6 We will need them outside of rombios32.c.
   7
   8 Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
   9 Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
  10 ---
  11  bios/rombios.h   |   10 ++++++++++
  12  bios/rombios32.c |   10 ----------
  13  2 files changed, 10 insertions(+), 10 deletions(-)
  14
  15 diff --git a/bios/rombios.h b/bios/rombios.h
  16 index 6f9cbb1..59ce19d 100644
  17 --- a/bios/rombios.h
  18 +++ b/bios/rombios.h
  19 @@ -58,6 +58,16 @@
  20  #define SMB_IO_BASE       0xb100
  21  #define SMP_MSR_ADDR      0x0510
  22
  23 +#define QEMU_CFG_CTL_PORT         0x510
  24 +#define QEMU_CFG_DATA_PORT        0x511
  25 +#define QEMU_CFG_SIGNATURE        0x00
  26 +#define QEMU_CFG_ID               0x01
  27 +#define QEMU_CFG_UUID             0x02
  28 +#define QEMU_CFG_NUMA             0x0d
  29 +#define QEMU_CFG_ARCH_LOCAL       0x8000
  30 +#define QEMU_CFG_ACPI_TABLES      (QEMU_CFG_ARCH_LOCAL + 0)
  31 +#define QEMU_CFG_SMBIOS_ENTRIES   (QEMU_CFG_ARCH_LOCAL + 1)
  32 +
  33    // Define the application NAME
  34  #if defined(BX_QEMU)
  35  #  define BX_APPNAME "QEMU"
  36 diff --git a/bios/rombios32.c b/bios/rombios32.c
  37 index f861f81..3fe4e48 100644
  38 --- a/bios/rombios32.c
  39 +++ b/bios/rombios32.c
  40 @@ -468,16 +468,6 @@ void wrmsr_smp(uint32_t index, uint64_t val)
  41  }
  42
  43  #ifdef BX_QEMU
  44 -#define QEMU_CFG_CTL_PORT 0x510
  45 -#define QEMU_CFG_DATA_PORT 0x511
  46 -#define QEMU_CFG_SIGNATURE  0x00
  47 -#define QEMU_CFG_ID         0x01
  48 -#define QEMU_CFG_UUID       0x02
  49 -#define QEMU_CFG_NUMA       0x0D
  50 -#define QEMU_CFG_ARCH_LOCAL     0x8000
  51 -#define QEMU_CFG_ACPI_TABLES  (QEMU_CFG_ARCH_LOCAL + 0)
  52 -#define QEMU_CFG_SMBIOS_ENTRIES  (QEMU_CFG_ARCH_LOCAL + 1)
  53 -
  54  int qemu_cfg_port;
  55
  56  void qemu_cfg_select(int f)
  57 --
  58 1.6.2.5
  59