vbox5: enable SMP setups

We use the use old IOAPIC implementation, which works for us much better than
the new one.

Issue #2338

repos/ports/lib/mk/virtualbox5-common.inc

@@ -45,12 +45,14 @@ VBOX_CC_OPT += -DRTLOG_REL_ENABLED -DRT_STRICT -DVBOX_STRICT
 
 VBOX_CC_OPT += -DVBOX_WITH_USB -DVBOX_WITH_VUSB
 
-VBOX_CC_OPT += -DVBOX_WITH_NEW_APIC
-VBOX_CC_OPT += -DVBOX_WITH_NEW_IOAPIC
+# SMP is not working with the new version
+# VBOX_CC_OPT += -DVBOX_WITH_NEW_APIC
+# VBOX_CC_OPT += -DVBOX_WITH_NEW_IOAPIC
 
 VBOX_CC_OPT += -DVBOX_WITH_E1000
 
 VBOX_CC_OPT += -DVBOX_WITH_AHCI
+VBOX_CC_OPT += -DVBOX_WITH_MULTI_CORE
 
 VIRTUALBOX_VERSION_MAJOR := $(shell cat $(VIRTUALBOX_DIR)/Config.kmk 2>/dev/null | grep "VBOX_VERSION_MAJOR = " | grep -v "'VBOX_VERSION_MAJOR" | sed "s/^.*= //")
 VIRTUALBOX_VERSION_MINOR := $(shell cat $(VIRTUALBOX_DIR)/Config.kmk 2>/dev/null | grep "VBOX_VERSION_MINOR = " | grep -v "'VBOX_VERSION_MINOR" | sed "s/^.*= //")

repos/ports/lib/mk/virtualbox5-devices.mk

@@ -13,7 +13,11 @@ SRC_CC += Devices/PC/DevACPI.cpp
 SRC_CC += Devices/PC/DevFwCommon.cpp
 SRC_CC += Devices/PC/DevDMA.cpp
 SRC_CC += Devices/PC/DevHPET.cpp
+ifeq ($(filter $(VBOX_CC_OPT),-DVBOX_WITH_NEW_IOAPIC),)
+SRC_CC += Devices/PC/DevIoApic_Old.cpp
+else
 SRC_CC += Devices/PC/DevIoApic.cpp
+endif
 SRC_CC += Devices/PC/DevLPC.cpp
 SRC_CC += Devices/PC/DevPcBios.cpp
 SRC_C  += Devices/PC/DevPcArch.c

repos/ports/lib/mk/virtualbox5-vmm.mk

@@ -87,8 +87,10 @@ SRC_CC += VMM/VMMR3/IOM.cpp
 SRC_CC += VMM/VMMAll/IOMAll.cpp
 SRC_CC += VMM/VMMAll/IOMAllMMIO.cpp
 
+ifneq ($(filter $(VBOX_CC_OPT),-DVBOX_WITH_NEW_APIC),)
 SRC_CC += VMM/VMMR3/APIC.cpp
 SRC_CC += VMM/VMMAll/APICAll.cpp
+endif
 
 CC_OPT += -DVBOX_IN_VMM