Changeset 68828 in vbox for trunk/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMainVM.cpp

Timestamp:

Sep 22, 2017 2:15:57 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

118082

Message:

ExtPack: Split up main module of extension pack, have a mandatory one for VBoxSVC and an optional one for the VM process. This finally eliminates the need to drag VBoxVMM into VBoxSVC on some platforms. Many other small cleanups, including reliably calling the unload hook from within a VM process, copy/paste with forgotten adjustments (e.g. extpacks still talking about skeleton) and spelling fixes.

File:

• trunk/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMainVM.cpp (copied) (copied from trunk/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp ) (4 diffs)

trunk/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMainVM.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Skeleton main module.
+ * Skeleton main VM module.
  */
 
 /*
- * Copyright (C) 2010-2016 Oracle Corporation
+ * Copyright (C) 2010-2017 Oracle Corporation
  *
  * Permission is hereby granted, free of charge, to any person
@@ -51 +51 @@
 
 // /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnInstalled}
+//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnConsoleReady}
 //  */
-// static DECLCALLBACK(void) vboxSkeletonExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
-// /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnUninstall}
-//  */
-// static DECLCALLBACK(int)  vboxSkeletonExtPack_Uninstall(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
+// static DECLCALLBACK(void)  vboxSkeletonExtPackVM_ConsoleReady(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole);
 //
 // /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVirtualBoxReady}
+//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnUnload}
 //  */
-// static DECLCALLBACK(void)  vboxSkeletonExtPack_VirtualBoxReady(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
+// static DECLCALLBACK(void) vboxSkeletonExtPackVM_Unload(PCVBOXEXTPACKVMREG pThis);
+//
+//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnVMConfigureVMM}
+//  */
+// static DECLCALLBACK(int)  vboxSkeletonExtPackVM_VMConfigureVMM(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
 //
 // /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnUnload}
+//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnVMPowerOn}
 //  */
-// static DECLCALLBACK(void) vboxSkeletonExtPack_Unload(PCVBOXEXTPACKREG pThis);
-// /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMCreated}
-//  */
-// static DECLCALLBACK(int)  vboxSkeletonExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, IMachine *pMachine);
+// static DECLCALLBACK(int)  vboxSkeletonExtPackVM_VMPowerOn(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
 //
 // /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM}
+//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnVMPowerOff}
 //  */
-// static DECLCALLBACK(int)  vboxSkeletonExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
+// static DECLCALLBACK(void) vboxSkeletonExtPackVM_VMPowerOff(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
 //
 // /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOn}
+//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnQueryObject}
 //  */
-// static DECLCALLBACK(int)  vboxSkeletonExtPack_VMPowerOn(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
-// /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
-//  */
-// static DECLCALLBACK(void) vboxSkeletonExtPack_VMPowerOff(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
-// /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
-//  */
-// static DECLCALLBACK(void) vboxSkeletonExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
+// static DECLCALLBACK(void) vboxSkeletonExtPackVM_QueryObject(PCVBOXEXTPACKVMREG pThis, PCRTUUID pObjectId);
 
 
-static const VBOXEXTPACKREG g_vboxSkeletonExtPackReg =
+static const VBOXEXTPACKVMREG g_vboxSkeletonExtPackVMReg =
 {
-    VBOXEXTPACKREG_VERSION,
+    VBOXEXTPACKVMREG_VERSION,
     /* .uVBoxFullVersion =  */  VBOX_FULL_VERSION,
-    /* .pfnInstalled =      */  NULL,
-    /* .pfnUninstall =      */  NULL,
-    /* .pfnVirtualBoxReady =*/  NULL,
     /* .pfnConsoleReady =   */  NULL,
     /* .pfnUnload =         */  NULL,
-    /* .pfnVMCreated =      */  NULL,
     /* .pfnVMConfigureVMM = */  NULL,
     /* .pfnVMPowerOn =      */  NULL,
@@ -113 +97 @@
     /* .pfnReserved6 =      */  NULL,
     /* .u32Reserved7 =      */  0,
-    VBOXEXTPACKREG_VERSION
+    VBOXEXTPACKVMREG_VERSION
 };
 
 
-/** @callback_method_impl{FNVBOXEXTPACKREGISTER}  */
-extern "C" DECLEXPORT(int) VBoxExtPackRegister(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKREG *ppReg, PRTERRINFO pErrInfo)
+/** @callback_method_impl{FNVBOXEXTPACKVMREGISTER}  */
+extern "C" DECLEXPORT(int) VBoxExtPackVMRegister(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKVMREG *ppReg, PRTERRINFO pErrInfo)
 {
     /*
@@ -139 +123 @@
      */
     g_pHlp = pHlp;
-    *ppReg = &g_vboxSkeletonExtPackReg;
+    *ppReg = &g_vboxSkeletonExtPackVMReg;
 
     return VINF_SUCCESS;