Changeset 12294 in vbox

Timestamp:

Sep 9, 2008 1:47:17 PM (16 years ago)

Author:

vboxsync

Message:

conditional compilation of guest SMP related stuff (disabled by default),
also memory above 4G included to that to give additional testing to the code

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/PC/BIOS/rombios.c (modified) (4 diffs)
• src/VBox/Devices/PC/DevPcBios.cpp (modified) (3 diffs)

trunk/Config.kmk

@@ -340 +340 @@
 # VBOX_WITH_64_BITS_GUESTS = 1
 endif
+# Enable SMP support in guests
+VBOX_WITH_SMP_GUESTS = 0
 # Enable the host/guest information service (aka guest properties).
 VBOX_WITH_GUEST_PROPS = 1
@@ -950 +952 @@
 ifdef VBOX_WITH_64_BITS_GUESTS
  DEFS += VBOX_WITH_64_BITS_GUESTS
+endif
+ifdef VBOX_WITH_SMP_GUESTS
+ DEFS += VBOX_WITH_SMP_GUESTS
 endif
 ifdef VBOX_WITH_HARDENING

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -4588 +4588 @@
 {
   Bit32u  extended_memory_size=0; // 64bits long
-#if 0  /* bird: later */
+#if VBOX_WITH_SMP_GUESTS
   Bit32u  extra_lowbits_memory_size=0;
 #endif
   Bit16u  CX,DX;
-#if 0  /* bird: later */
+#if VBOX_WITH_SMP_GUESTS
   Bit8u   extra_highbits_memory_size=0;
 #endif
@@ -4668 +4668 @@
                 }
 
-#if 0 /* bird: later (btw. this ain't making sense complixity wise, unless its a AMI/AWARD/PHOENIX interface) */
+#if VBOX_WITH_SMP_GUESTS /* bird: later (btw. this ain't making sense complixity wise, unless its a AMI/AWARD/PHOENIX interface) */
                 extra_lowbits_memory_size = inb_cmos(0x61);
                 extra_lowbits_memory_size <<= 8;
@@ -4743 +4743 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        0xfffc0000L, 0x00000000L, 0, 0, 2);
-#if 0 /* bird: later */
+#if VBOX_WITH_SMP_GUESTS
                         if (extra_highbits_memory_size || extra_lowbits_memory_size)
                             regs.u.r32.ebx = 6;
@@ -4753 +4753 @@
                         CLEAR_CF();
                         return;
-#if 0 /* bird: later */
+#if VBOX_WITH_SMP_GUESTS
                     case 6:
                         /* Mapping of memory above 4 GB */

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -99 +99 @@
  *       too big, besides it forces unnecessary math stuff onto
  *       the BIOS.
+ *       nike: The way how values encoded are defined by Bochs/QEmu BIOS,
+ *       although for them position in CMOS is different:
+ *         0x5b - 0x5c: RAM above 4G
+ *         0x5f: number of CPUs
+ *        Unfortunately for us those positions in our CMOS are already taken 
+ *        by 4th SATA drive configuration. 
+ *         
  */
 
@@ -510 +517 @@
      * Memory sizes.
      */
-#if 0
+#if VBOX_WITH_SMP_GUESTS
     uint64_t cKBRam = pThis->cbRam / _1K;
     uint64_t cKBAbove4GB = 0;
@@ -1372 +1379 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"NumCPUs\" as integer failed"));
+
+#ifdef VBOX_WITH_SMP_GUESTS
+    pThis->cCpus = 2;
+    LogRel(("Running with %d CPUs\n", pThis->cCpus));
+#else
+    if (pThis->cCpus != 1)
+    {
+        LogRel(("WARNING: guest SMP not supported in this build, going UP\n"));
+        pThis->cCpus = 1;
+    }
+#endif
 
     rc = CFGMR3QueryU8Def(pCfgHandle, "IOAPIC", &pThis->u8IOAPIC, 1);