Changeset 65338 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 16, 2017 2:11:15 PM (8 years ago)

Author:

vboxsync

Message:

Remove the old, unused I/O APIC code and related define.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (8 diffs)
• PC/DevIoApic_Old.cpp (deleted)
• build/VBoxDD.cpp (modified) (1 diff)
• build/VBoxDD.h (modified) (1 diff)
• build/VBoxDD2.cpp (modified) (1 diff)
• build/VBoxDD2.h (modified) (1 diff)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/tstDeviceStructSize.cpp (modified) (2 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -120 +120 @@
         VBOX_HGCM_HOST_CODE \
         $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
-        $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,) \
         $(if $(VBOX_BIOS_DMI_FALLBACK),VBOX_BIOS_DMI_FALLBACK,) \
         VBOX_WITH_DMI_CHASSIS \
@@ -159 +158 @@
         PC/DevDMA.cpp \
         PC/DevHPET.cpp \
-        $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIoApic.cpp,) \
+        PC/DevIoApic.cpp \
         Storage/DevFdc.cpp \
         Serial/DevSerial.cpp \
@@ -929 +928 @@
         Input/PS2M.cpp \
         PC/DevACPI.cpp \
-        $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIoApic.cpp,) \
+        PC/DevIoApic.cpp \
         PC/DevPit-i8254.cpp \
         PC/DevPIC.cpp \
@@ -1048 +1047 @@
  VBoxDD2_DEFS            = \
         IN_VBOXDD2 \
-        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,) \
-        $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,)
+        $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,)
  VBoxDD2_INCS           := \
         build \
@@ -1055 +1053 @@
  VBoxDD2_SOURCES         = \
         build/VBoxDD2.cpp  \
-        PC/DevLPC.cpp \
-        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp)
+        PC/DevLPC.cpp
  VBoxDD2_LIBS            = \
         $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
@@ -1092 +1089 @@
         Input/PS2M.cpp \
         PC/DevACPI.cpp \
-        $(if $(VBOX_WITH_NEW_IOAPIC),PC/DevIoApic.cpp,) \
+        PC/DevIoApic.cpp \
         PC/DevPit-i8254.cpp \
         PC/DevPIC.cpp \
@@ -1216 +1213 @@
   VBoxDD2RC_INCS           = build
   VBoxDD2RC_SOURCES        = \
-        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp) \
         build/VBoxDD2R0.cpp # Dummy to prevent linking errors.
   if1of ($(VBOX_LDR_FMT32), pe lx)
@@ -1234 +1230 @@
  VBoxDD2R0_INCS           = build
  VBoxDD2R0_SOURCES        = \
-        build/VBoxDD2R0.cpp \
-        $(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic_Old.cpp)
+        build/VBoxDD2R0.cpp
  if1of ($(VBOX_LDR_FMT), pe lx)
   VBoxDD2R0_LIBS          = \

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -66 +66 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifdef VBOX_WITH_NEW_IOAPIC
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceIOAPIC);
     if (RT_FAILURE(rc))
         return rc;
-#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePS2KeyboardMouse);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -35 +35 @@
 extern const PDMDEVREG g_DevicePcArch;
 extern const PDMDEVREG g_DevicePcBios;
-#ifdef VBOX_WITH_NEW_IOAPIC
 extern const PDMDEVREG g_DeviceIOAPIC;
-#endif
 extern const PDMDEVREG g_DevicePS2KeyboardMouse;
 extern const PDMDEVREG g_DeviceI8254;

trunk/src/VBox/Devices/build/VBoxDD2.cpp

@@ -61 +61 @@
     LogFlow(("VBoxDevicesRegister: u32Version=%#x\n", u32Version));
     AssertReleaseMsg(u32Version == VBOX_VERSION, ("u32Version=%#x VBOX_VERSION=%#x\n", u32Version, VBOX_VERSION));
-    int rc;
 
-#ifndef VBOX_WITH_NEW_IOAPIC
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceIOAPIC);
-    if (RT_FAILURE(rc))
-        return rc;
-#endif
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
+    int rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceLPC);
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/Devices/build/VBoxDD2.h

@@ -61 +61 @@
 #endif /* !IN_VBOXDD2 */
 
-#ifndef VBOX_WITH_NEW_IOAPIC
-extern const PDMDEVREG g_DeviceIOAPIC;
-#endif
 extern const PDMDEVREG g_DeviceLPC;
 

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -35 +35 @@
         $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
         $(if $(VBOX_WITH_LSILOGIC),VBOX_WITH_LSILOGIC,) \
-        $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,) \
         $(if $(VBOX_WITH_NVME_IMPL),VBOX_WITH_NVME_IMPL,) \
         $(if $(VBOX_WITH_PCI_PASSTHROUGH_IMPL),VBOX_WITH_PCI_PASSTHROUGH_IMPL,) \

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -59 +59 @@
 # include "../../VMM/VMMR3/APIC.cpp"
 #undef LOG_GROUP
-#ifdef VBOX_WITH_NEW_IOAPIC
-# include "../PC/DevIoApic.cpp"
-#else
-# include "../PC/DevIoApic_Old.cpp"
-#endif
+#include "../PC/DevIoApic.cpp"
 #undef LOG_GROUP
 #include "../PC/DevHPET.cpp"
@@ -328 +324 @@
 #endif
     CHECK_MEMBER_ALIGNMENT(E1KSTATE, StatReceiveBytes, 8);
-#ifdef VBOX_WITH_NEW_IOAPIC
     CHECK_MEMBER_ALIGNMENT(IOAPIC, au64RedirTable, 8);
 # ifdef VBOX_WITH_STATISTICS
     CHECK_MEMBER_ALIGNMENT(IOAPIC, StatMmioReadRZ, 8);
 # endif
-#else
-# ifdef VBOX_WITH_STATISTICS
-    CHECK_MEMBER_ALIGNMENT(IOAPIC, StatMMIOReadGC, 8);
-    CHECK_MEMBER_ALIGNMENT(IOAPIC, StatMMIOReadGC, 8);
-# endif
-#endif
     CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, GCPhysMMIOBase, 8);
     CHECK_MEMBER_ALIGNMENT(LSILOGISCSI, aMessage, 8);

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -61 +61 @@
 # include "../../VMM/VMMR3/APIC.cpp"
 #undef LOG_GROUP
-#ifdef VBOX_WITH_NEW_IOAPIC
-# include "../PC/DevIoApic.cpp"
-#else
-# include "../PC/DevIoApic_Old.cpp"
-#endif
+#include "../PC/DevIoApic.cpp"
 #undef LOG_GROUP
 #include "../Storage/DevATA.cpp"
@@ -775 +771 @@
 # endif /* VBOX_WITH_STATISTICS */
 
-#ifdef VBOX_WITH_NEW_IOAPIC
     /* PC/DevIoApic.cpp */
     GEN_CHECK_SIZE(IOAPIC);
@@ -799 +794 @@
     GEN_CHECK_OFF(IOAPIC, StatSetEoiR3);
 # endif
-#else
-    /* PC/DevIoApic_Old.cpp */
-    GEN_CHECK_SIZE(IOAPIC);
-    GEN_CHECK_OFF(IOAPIC, id);
-    GEN_CHECK_OFF(IOAPIC, ioregsel);
-    GEN_CHECK_OFF(IOAPIC, irr);
-    GEN_CHECK_OFF(IOAPIC, ioredtbl);
-    GEN_CHECK_OFF(IOAPIC, ioredtbl[1]);
-    GEN_CHECK_OFF(IOAPIC, ioredtbl[IOAPIC_NUM_PINS - 1]);
-    GEN_CHECK_OFF(IOAPIC, pDevInsR3);
-    GEN_CHECK_OFF(IOAPIC, pIoApicHlpR3);
-    GEN_CHECK_OFF(IOAPIC, pDevInsR0);
-    GEN_CHECK_OFF(IOAPIC, pIoApicHlpR0);
-    GEN_CHECK_OFF(IOAPIC, pDevInsRC);
-    GEN_CHECK_OFF(IOAPIC, pIoApicHlpRC);
-# ifdef VBOX_WITH_STATISTICS
-    GEN_CHECK_OFF(IOAPIC, StatMMIOReadGC);
-    GEN_CHECK_OFF(IOAPIC, StatSetIrqHC);
-# endif
-#endif /* VBOX_WITH_NEW_IOAPIC */
 
     /* Storage/DevATA.cpp */