Changeset 57521 in vbox for trunk/src/VBox

Timestamp:

Aug 25, 2015 9:50:45 AM (9 years ago)

Author:

vboxsync

Message:

NVMe: Changes required for building it and integrating into the PUEL extension pack (not build by default, use VBOX_WITH_NVME_IMPL to enable)

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (4 diffs)
• build/VBoxDD.cpp (modified) (1 diff)
• build/VBoxDD.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -479 +479 @@
  endif
 
+  if defined(VBOX_WITH_NVME_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   VBoxDD_DEFS          += VBOX_WITH_NVME_IMPL
+   VBoxDD_SOURCES       += \
+        Storage/DevNVMe.cpp
+  endif
+
  ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
   VBoxDD_DEFS           += VBOX_WITH_PDM_ASYNC_COMPLETION
@@ -966 +972 @@
   VBoxDDRC_SOURCES      += \
         Storage/DevLsiLogicSCSI.cpp
+  endif
+
+  if defined(VBOX_WITH_NVME_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   VBoxDDGC_DEFS       += VBOX_WITH_NVME_IMPL
+   VBoxDDGC_SOURCES    += \
+        Storage/DevNVMe.cpp
   endif
 
@@ -1140 +1152 @@
  endif
 
+ if defined(VBOX_WITH_NVME_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+  VBoxDDR0_DEFS       += VBOX_WITH_NVME_IMPL
+  VBoxDDR0_SOURCES    += \
+        Storage/DevNVMe.cpp
+ endif
+
  ifdef VBOX_WITH_NEW_PS2M
   VBoxDDR0_DEFS         += VBOX_WITH_NEW_PS2M
@@ -1335 +1353 @@
 
   Bus/DevPciRaw.cpp_INCS    = Bus
+ endif
+
+ #
+ # The NVMe Extension Pack Modules.
+ #
+ if defined(VBOX_WITH_NVME_IMPL)
+  DLLS += VBoxNvmeR3
+  VBoxNvmeR3_TEMPLATE = VBoxR3ExtPackPuel
+  VBoxNvmeR3_SOURCES  = \
+        Storage/DevNVMe.cpp
+  VBoxNvmeR3_SOURCES.win = \
+        build/VBoxNvmeR3.rc
+
+  SYSMODS += VBoxNvmeR0
+  VBoxNvmeR0_TEMPLATE = VBoxR0ExtPackPuel
+  VBoxNvmeR0_SOURCES  = \
+        Storage/DevNVMe.cpp
+
+  ifdef VBOX_WITH_RAW_MODE
+   SYSMODS += VBoxNvmeRC
+   VBoxNvmeRC_TEMPLATE = VBoxRcExtPackPuel
+   VBoxNvmeRC_SOURCES  = \
+        Storage/DevNVMe.cpp
+  endif
+
+  # Hacky but MSI support *must* be enabled
+  ifdef VBOX_WITH_MSI_DEVICES
+   VBoxNvmeR3_DEFS += VBOX_WITH_MSI_DEVICES
+   VBoxNvmeR0_DEFS += VBOX_WITH_MSI_DEVICES
+   VBoxNvmeRC_DEFS += VBOX_WITH_MSI_DEVICES
+  endif
+
  endif
 

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

@@ -181 +181 @@
         return rc;
 #endif
+#ifdef VBOX_WITH_NVME_IMPL
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceNVMe);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
 #ifdef VBOX_WITH_PCI_PASSTHROUGH_IMPL
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePciRaw);

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

@@ -75 +75 @@
 extern const PDMDEVREG g_DeviceLsiLogicSCSI;
 extern const PDMDEVREG g_DeviceLsiLogicSAS;
+#endif
+#ifdef VBOX_WITH_NVME_IMPL
+extern const PDMDEVREG g_DeviceNVMe;
 #endif
 #ifdef VBOX_WITH_EFI