Changeset 52473 in vbox

Timestamp:

Aug 22, 2014 1:35:55 PM (11 years ago)

Author:

vboxsync

Message:

Devices/Misc: new VirtualKD stub/loader device, contributed by Ivan Shcherbakov (and heavily modified afterwards to integrate cleanly into VirtualBox and match the coding style)

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (5 diffs)
• src/VBox/Devices/Misc (added)
• src/VBox/Devices/Misc/Makefile.kup (added)
• src/VBox/Devices/Misc/VirtualKD.cpp (added)
• src/VBox/Devices/build/VBoxDD.cpp (modified) (2 diffs)
• src/VBox/Devices/build/VBoxDD.h (modified) (3 diffs)

trunk/Config.kmk

@@ -521 +521 @@
 # Disk crypt plugin
 VBOX_WITH_PLUGIN_CRYPT = 1
+# VirtualKD stub/loader device, only relevant on Windows host
+VBOX_WITH_VIRTUALKD = 1
 ## @}
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2013 Oracle Corporation
+# Copyright (C) 2006-2014 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -514 +514 @@
          Audio/audiosniffer.c \
          Audio/noaudio.c \
-         Audio/filteraudio.c 
+         Audio/filteraudio.c
  endif
 
@@ -698 +698 @@
  else
    VBoxDD_SOURCES.linux  += \
-         Audio/ossaudio.c 
- endif
-  
+         Audio/ossaudio.c
+ endif
+
  ifeq ($(KBUILD_TARGET),os2)
  VBoxDD_SOURCES        := $(filter-out Storage/DrvHost%, $(VBoxDD_SOURCES))
@@ -714 +714 @@
   else
     VBoxDD_SOURCES.solaris += \
-          Audio/solaudio.c 
+          Audio/solaudio.c
   endif
   ifdef VBOX_WITH_SOLARIS_OSS
@@ -742 +742 @@
  else
  VBoxDD_SOURCES.win    += \
-   Audio/dsoundaudio.c 
+   Audio/dsoundaudio.c
+ endif
+
+ ifdef VBOX_WITH_VIRTUALKD
+  VBoxDD_DEFS.win     += VBOX_WITH_VIRTUALKD
+  VBoxDD_SOURCES.win  += \
+    Misc/VirtualKD.cpp
  endif
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -200 +200 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef VBOX_WITH_VIRTUALKD
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceVirtualKD);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
 
     return VINF_SUCCESS;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -85 +85 @@
 extern const PDMDEVREG g_DevicePciRaw;
 #endif
+extern const PDMDEVREG g_DeviceGIMDev;
+#ifdef VBOX_WITH_VIRTUALKD
+extern const PDMDEVREG g_DeviceVirtualKD;
+#endif
 
 extern const PDMDRVREG g_DrvMouseQueue;
@@ -148 +152 @@
 extern const PDMDRVREG g_DrvPciRaw;
 #endif
-extern const PDMDEVREG g_DeviceGIMDev;
 
 #ifdef VBOX_WITH_USB