VirtualBox

Changeset 68828 in vbox for trunk/src/VBox/ExtPacks


Ignore:
Timestamp:
Sep 22, 2017 2:15:57 PM (7 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.

Location:
trunk/src/VBox/ExtPacks
Files:
8 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/ExtPacks/BusMouseSample/ExtPack.xml

    r44446 r68828  
    55    <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING@</Version>
    66    <MainModule>VBoxBusMouseMain</MainModule>
     7    <MainVMModule>VBoxBusMouseMainVM</MainVMModule>
    78    <ShowLicense/>
    89</VirtualBoxExtensionPack>

  • trunk/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk

    r62496 r68828  
    55
    66#
    7 # Copyright (C) 2010-2016 Oracle Corporation
     7# Copyright (C) 2010-2017 Oracle Corporation
    88#
    99# Permission is hereby granted, free of charge, to any person
    … …  
    6969
    7070#
     71# VBoxBusMouseMainVM - The module in a VM which the VirtualBox Main API talks to.
     72#
     73DLLS += VBoxBusMouseMainVM
     74VBoxBusMouseMainVM_TEMPLATE = VBoxR3ExtPackBusMouse
     75VBoxBusMouseMainVM_SOURCES = VBoxBusMouseMainVM.cpp
     76VBoxBusMouseMainVM_DEFS =
     77
     78
     79#
    7180# The device code.
    7281#
    … …  
    112121VBOX_BUSMOUSE_FILES_MACRO = \
    113122        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_BUSMOUSE_MANGLED_NAME)/$(1)/VBoxBusMouseMain.$(3)=>$(1)/VBoxBusMouseMain.$(3) \
     123        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_BUSMOUSE_MANGLED_NAME)/$(1)/VBoxBusMouseMainVM.$(3)=>$(1)/VBoxBusMouseMainVM.$(3) \
    114124        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_BUSMOUSE_MANGLED_NAME)/$(1)/VBoxBusMouseR3.$(3)=>$(1)/VBoxBusMouseR3.$(3) \
    115125        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_BUSMOUSE_MANGLED_NAME)/$(1)/VBoxBusMouseR0.r0=>$(1)/VBoxBusMouseR0.r0

  • trunk/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMain.cpp

    r63419 r68828  
    55
    66/*
    7  * Copyright (C) 2010-2016 Oracle Corporation
     7 * Copyright (C) 2010-2017 Oracle Corporation
    88 *
    99 * Permission is hereby granted, free of charge, to any person
    … …  
    3737#include <VBox/err.h>
    3838#include <VBox/version.h>
    39 #include <VBox/vmm/cfgm.h>
    4039#include <iprt/string.h>
    4140#include <iprt/param.h>
    … …  
    5352//  * @interface_method_impl{VBOXEXTPACKREG,pfnInstalled}
    5453//  */
    55 // static DECLCALLBACK(void) vboxSkeletonExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     54// static DECLCALLBACK(void) vboxBusMouseExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, PRTERRINFO pErrInfo);
     55//
    5656// /**
    5757//  * @interface_method_impl{VBOXEXTPACKREG,pfnUninstall}
    5858//  */
    59 // static DECLCALLBACK(int)  vboxSkeletonExtPack_Uninstall(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     59// static DECLCALLBACK(int)  vboxBusMouseExtPack_Uninstall(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
    6060//
    6161// /**
    6262//  * @interface_method_impl{VBOXEXTPACKREG,pfnVirtualBoxReady}
    6363//  */
    64 // static DECLCALLBACK(void)  vboxSkeletonExtPack_VirtualBoxReady(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     64// static DECLCALLBACK(void)  vboxBusMouseExtPack_VirtualBoxReady(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
    6565//
    6666// /**
    6767//  * @interface_method_impl{VBOXEXTPACKREG,pfnUnload}
    6868//  */
    69 // static DECLCALLBACK(void) vboxSkeletonExtPack_Unload(PCVBOXEXTPACKREG pThis);
     69// static DECLCALLBACK(void) vboxBusMouseExtPack_Unload(PCVBOXEXTPACKREG pThis);
     70//
    7071// /**
    7172//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMCreated}
    7273//  */
    73 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, IMachine *pMachine);
     74// static DECLCALLBACK(int)  vboxBusMouseExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, VBOXEXTPACK_IF_CS(IMachine) *pMachine);
    7475//
    75 
    76 /**
    77  * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM
    78  */
    79 static DECLCALLBACK(int)  vboxBusMouseExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM)
    80 {
    81     RT_NOREF(pThis, pConsole);
    82 
    83     /*
    84      * Find the bus mouse module and tell PDM to load it.
    85      * ASSUME /PDM/Devices exists.
    86      */
    87     char szPath[RTPATH_MAX];
    88     int rc = g_pHlp->pfnFindModule(g_pHlp, "VBoxBusMouseR3", NULL, VBOXEXTPACKMODKIND_R3, szPath, sizeof(szPath), NULL);
    89     if (RT_FAILURE(rc))
    90         return rc;
    91 
    92     PCFGMNODE pCfgRoot = CFGMR3GetRoot(pVM);
    93     AssertReturn(pCfgRoot, VERR_INTERNAL_ERROR_3);
    94 
    95     PCFGMNODE pCfgDevices = CFGMR3GetChild(pCfgRoot, "PDM/Devices");
    96     AssertReturn(pCfgDevices, VERR_INTERNAL_ERROR_3);
    97 
    98     PCFGMNODE pCfgMine;
    99     rc = CFGMR3InsertNode(pCfgDevices, "VBoxBusMouse", &pCfgMine);
    100     AssertRCReturn(rc, rc);
    101     rc = CFGMR3InsertString(pCfgMine, "Path", szPath);
    102     AssertRCReturn(rc, rc);
    103 
    104     /*
    105      * Tell PDM where to find the R0 and RC modules for the bus mouse device.
    106      */
    107 #ifdef VBOX_WITH_RAW_MODE
    108     rc = g_pHlp->pfnFindModule(g_pHlp, "VBoxBusMouseRC", NULL, VBOXEXTPACKMODKIND_RC, szPath, sizeof(szPath), NULL);
    109     AssertRCReturn(rc, rc);
    110     RTPathStripFilename(szPath);
    111     rc = CFGMR3InsertString(pCfgMine, "RCSearchPath", szPath);
    112     AssertRCReturn(rc, rc);
    113 #endif
    114 
    115     rc = g_pHlp->pfnFindModule(g_pHlp, "VBoxBusMouseR0", NULL, VBOXEXTPACKMODKIND_R0, szPath, sizeof(szPath), NULL);
    116     AssertRCReturn(rc, rc);
    117     RTPathStripFilename(szPath);
    118     rc = CFGMR3InsertString(pCfgMine, "R0SearchPath", szPath);
    119     AssertRCReturn(rc, rc);
    120 
    121     return VINF_SUCCESS;
    122 }
    123 
    12476// /**
    125 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOn}
     77//  * @interface_method_impl{VBOXEXTPACKREG,pfnQueryObject}
    12678//  */
    127 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMPowerOn(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    128 // /**
    129 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
    130 //  */
    131 // static DECLCALLBACK(void) vboxSkeletonExtPack_VMPowerOff(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    132 // /**
    133 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
    134 //  */
    135 // static DECLCALLBACK(void) vboxSkeletonExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
     79// static DECLCALLBACK(void) vboxBusMouseExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
    13680
    13781
    … …  
    14387    /* .pfnUninstall =      */  NULL,
    14488    /* .pfnVirtualBoxReady =*/  NULL,
    145     /* .pfnConsoleReady =   */  NULL,
    14689    /* .pfnUnload =         */  NULL,
    14790    /* .pfnVMCreated =      */  NULL,
    148     /* .pfnVMConfigureVMM = */  vboxBusMouseExtPack_VMConfigureVMM,
    149     /* .pfnVMPowerOn =      */  NULL,
    150     /* .pfnVMPowerOff =     */  NULL,
    15191    /* .pfnQueryObject =    */  NULL,
    15292    /* .pfnReserved1 =      */  NULL,

  • trunk/src/VBox/ExtPacks/BusMouseSample/VBoxBusMouseMainVM.cpp

    r68805 r68828  
    11/* $Id$ */
    22/** @file
    3  * Bus Mouse main module.
     3 * Bus Mouse main VM module.
    44 */
    55
    66/*
    7  * Copyright (C) 2010-2016 Oracle Corporation
     7 * Copyright (C) 2010-2017 Oracle Corporation
    88 *
    99 * Permission is hereby granted, free of charge, to any person
    … …  
    5151
    5252// /**
    53 //  * @interface_method_impl{VBOXEXTPACKREG,pfnInstalled}
     53//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnConsoleReady}
    5454//  */
    55 // static DECLCALLBACK(void) vboxSkeletonExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
    56 // /**
    57 //  * @interface_method_impl{VBOXEXTPACKREG,pfnUninstall}
    58 //  */
    59 // static DECLCALLBACK(int)  vboxSkeletonExtPack_Uninstall(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     55// static DECLCALLBACK(void)  vboxBusMouseExtPackVM_ConsoleReady(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole);
    6056//
    6157// /**
    62 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVirtualBoxReady}
     58//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnUnload}
    6359//  */
    64 // static DECLCALLBACK(void)  vboxSkeletonExtPack_VirtualBoxReady(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
    65 //
    66 // /**
    67 //  * @interface_method_impl{VBOXEXTPACKREG,pfnUnload}
    68 //  */
    69 // static DECLCALLBACK(void) vboxSkeletonExtPack_Unload(PCVBOXEXTPACKREG pThis);
    70 // /**
    71 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMCreated}
    72 //  */
    73 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, IMachine *pMachine);
    74 //
     60// static DECLCALLBACK(void) vboxBusMouseExtPackVM_Unload(PCVBOXEXTPACKVMREG pThis);
    7561
    7662/**
    77  * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM
     63 * @interface_method_impl{VBOXEXTPACKVMREG,pfnVMConfigureVMM
    7864 */
    79 static DECLCALLBACK(int)  vboxBusMouseExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM)
     65static DECLCALLBACK(int)  vboxBusMouseExtPackVM_VMConfigureVMM(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM)
    8066{
    8167    RT_NOREF(pThis, pConsole);
    … …  
    123109
    124110// /**
    125 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOn}
     111//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnVMPowerOn}
    126112//  */
    127 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMPowerOn(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
     113// static DECLCALLBACK(int)  vboxBusMouseExtPackVM_VMPowerOn(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
     114//
    128115// /**
    129 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
     116//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnVMPowerOff}
    130117//  */
    131 // static DECLCALLBACK(void) vboxSkeletonExtPack_VMPowerOff(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
     118// static DECLCALLBACK(void) vboxBusMouseExtPackVM_VMPowerOff(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
     119//
    132120// /**
    133 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
     121//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnQueryObject}
    134122//  */
    135 // static DECLCALLBACK(void) vboxSkeletonExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
     123// static DECLCALLBACK(void) vboxBusMouseExtPackVM_QueryObject(PCVBOXEXTPACKVMREG pThis, PCRTUUID pObjectId);
    136124
    137125
    138 static const VBOXEXTPACKREG g_vboxBusMouseExtPackReg =
     126static const VBOXEXTPACKVMREG g_vboxBusMouseExtPackVMReg =
    139127{
    140     VBOXEXTPACKREG_VERSION,
     128    VBOXEXTPACKVMREG_VERSION,
    141129    /* .uVBoxFullVersion =  */  VBOX_FULL_VERSION,
    142     /* .pfnInstalled =      */  NULL,
    143     /* .pfnUninstall =      */  NULL,
    144     /* .pfnVirtualBoxReady =*/  NULL,
    145130    /* .pfnConsoleReady =   */  NULL,
    146131    /* .pfnUnload =         */  NULL,
    147     /* .pfnVMCreated =      */  NULL,
    148     /* .pfnVMConfigureVMM = */  vboxBusMouseExtPack_VMConfigureVMM,
     132    /* .pfnVMConfigureVMM = */  vboxBusMouseExtPackVM_VMConfigureVMM,
    149133    /* .pfnVMPowerOn =      */  NULL,
    150134    /* .pfnVMPowerOff =     */  NULL,
    … …  
    157141    /* .pfnReserved6 =      */  NULL,
    158142    /* .u32Reserved7 =      */  0,
    159     VBOXEXTPACKREG_VERSION
     143    VBOXEXTPACKVMREG_VERSION
    160144};
    161145
    162146
    163 /** @callback_method_impl{FNVBOXEXTPACKREGISTER}  */
    164 extern "C" DECLEXPORT(int) VBoxExtPackRegister(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKREG *ppReg, PRTERRINFO pErrInfo)
     147/** @callback_method_impl{FNVBOXEXTPACKVMREGISTER}  */
     148extern "C" DECLEXPORT(int) VBoxExtPackVMRegister(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKVMREG *ppReg, PRTERRINFO pErrInfo)
    165149{
    166150    /*
    … …  
    183167     */
    184168    g_pHlp = pHlp;
    185     *ppReg = &g_vboxBusMouseExtPackReg;
     169    *ppReg = &g_vboxBusMouseExtPackVMReg;
    186170
    187171    return VINF_SUCCESS;

  • trunk/src/VBox/ExtPacks/Skeleton/ExtPack.xml

    r35963 r68828  
    55    <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING@</Version>
    66    <MainModule>VBoxSkeletonMain</MainModule>
     7    <MainVMModule>VBoxSkeletonMainVM</MainVMModule>
    78    <!-- VRDEModule>VBoxVNC</VRDEModule -->
    89    <ShowLicense/>

  • trunk/src/VBox/ExtPacks/Skeleton/Makefile.kmk

    r62496 r68828  
    55
    66#
    7 # Copyright (C) 2010-2016 Oracle Corporation
     7# Copyright (C) 2010-2017 Oracle Corporation
    88#
    99# Permission is hereby granted, free of charge, to any person
    … …  
    6868
    6969#
     70# VBoxSkeletonMainVM - The module in a VM which the VirtualBox Main API talks to.
     71#
     72DLLS += VBoxSkeletonMainVM
     73VBoxSkeletonMainVM_TEMPLATE = VBoxR3ExtPackSkeleton
     74VBoxSkeletonMainVM_SOURCES = VBoxSkeletonMainVM.cpp
     75VBoxSkeletonMainVM_DEFS =
     76
     77#
    7078# Install the description.
    7179#
    … …  
    92100# Build the file list.  The macro takes 1=darwin.x86, 2=dist/VirtualBox.app/Contents/MacOS, 3=dylib
    93101VBOX_SKELETON_FILES_MACRO = \
    94         $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_SKELETON_MANGLED_NAME)/$(1)/VBoxSkeletonMain.$(3)=>$(1)/VBoxSkeletonMain.$(3)
     102        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_SKELETON_MANGLED_NAME)/$(1)/VBoxSkeletonMain.$(3)=>$(1)/VBoxSkeletonMain.$(3) \
     103        $(PATH_OUT_BASE)/$(1)/$(KBUILD_TYPE)/$(2)/ExtensionPacks/$(VBOX_SKELETON_MANGLED_NAME)/$(1)/VBoxSkeletonMainVM.$(3)=>$(1)/VBoxSkeletonMainVM.$(3)
    95104
    96105VBOX_SKELETON_FILES := \

  • trunk/src/VBox/ExtPacks/Skeleton/VBoxSkeletonMain.cpp

    r62496 r68828  
    55
    66/*
    7  * Copyright (C) 2010-2016 Oracle Corporation
     7 * Copyright (C) 2010-2017 Oracle Corporation
    88 *
    99 * Permission is hereby granted, free of charge, to any person
    … …  
    3737#include <VBox/err.h>
    3838#include <VBox/version.h>
    39 #include <VBox/vmm/cfgm.h>
    4039#include <iprt/string.h>
    4140#include <iprt/param.h>
    … …  
    5352//  * @interface_method_impl{VBOXEXTPACKREG,pfnInstalled}
    5453//  */
    55 // static DECLCALLBACK(void) vboxSkeletonExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     54// static DECLCALLBACK(void) vboxSkeletonExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, PRTERRINFO pErrInfo);
     55//
    5656// /**
    5757//  * @interface_method_impl{VBOXEXTPACKREG,pfnUninstall}
    … …  
    6868//  */
    6969// static DECLCALLBACK(void) vboxSkeletonExtPack_Unload(PCVBOXEXTPACKREG pThis);
     70//
    7071// /**
    7172//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMCreated}
    7273//  */
    73 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, IMachine *pMachine);
     74// static DECLCALLBACK(int)  vboxSkeletonExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, VBOXEXTPACK_IF_CS(IMachine) *pMachine);
    7475//
    7576// /**
    76 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM}
     77//  * @interface_method_impl{VBOXEXTPACKREG,pfnQueryObject}
    7778//  */
    78 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    79 //
    80 // /**
    81 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOn}
    82 //  */
    83 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMPowerOn(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    84 // /**
    85 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
    86 //  */
    87 // static DECLCALLBACK(void) vboxSkeletonExtPack_VMPowerOff(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    88 // /**
    89 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
    90 //  */
    91 // static DECLCALLBACK(void) vboxSkeletonExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
     79// static DECLCALLBACK(int)  vboxSkeletonExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
    9280
    9381
    … …  
    9987    /* .pfnUninstall =      */  NULL,
    10088    /* .pfnVirtualBoxReady =*/  NULL,
    101     /* .pfnConsoleReady =   */  NULL,
    10289    /* .pfnUnload =         */  NULL,
    10390    /* .pfnVMCreated =      */  NULL,
    104     /* .pfnVMConfigureVMM = */  NULL,
    105     /* .pfnVMPowerOn =      */  NULL,
    106     /* .pfnVMPowerOff =     */  NULL,
    10791    /* .pfnQueryObject =    */  NULL,
    10892    /* .pfnReserved1 =      */  NULL,

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

    r68805 r68828  
    11/* $Id$ */
    22/** @file
    3  * Skeleton main module.
     3 * Skeleton main VM module.
    44 */
    55
    66/*
    7  * Copyright (C) 2010-2016 Oracle Corporation
     7 * Copyright (C) 2010-2017 Oracle Corporation
    88 *
    99 * Permission is hereby granted, free of charge, to any person
    … …  
    5151
    5252// /**
    53 //  * @interface_method_impl{VBOXEXTPACKREG,pfnInstalled}
     53//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnConsoleReady}
    5454//  */
    55 // static DECLCALLBACK(void) vboxSkeletonExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
    56 // /**
    57 //  * @interface_method_impl{VBOXEXTPACKREG,pfnUninstall}
    58 //  */
    59 // static DECLCALLBACK(int)  vboxSkeletonExtPack_Uninstall(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     55// static DECLCALLBACK(void)  vboxSkeletonExtPackVM_ConsoleReady(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole);
    6056//
    6157// /**
    62 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVirtualBoxReady}
     58//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnUnload}
    6359//  */
    64 // static DECLCALLBACK(void)  vboxSkeletonExtPack_VirtualBoxReady(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     60// static DECLCALLBACK(void) vboxSkeletonExtPackVM_Unload(PCVBOXEXTPACKVMREG pThis);
     61//
     62//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnVMConfigureVMM}
     63//  */
     64// static DECLCALLBACK(int)  vboxSkeletonExtPackVM_VMConfigureVMM(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
    6565//
    6666// /**
    67 //  * @interface_method_impl{VBOXEXTPACKREG,pfnUnload}
     67//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnVMPowerOn}
    6868//  */
    69 // static DECLCALLBACK(void) vboxSkeletonExtPack_Unload(PCVBOXEXTPACKREG pThis);
    70 // /**
    71 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMCreated}
    72 //  */
    73 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, IMachine *pMachine);
     69// static DECLCALLBACK(int)  vboxSkeletonExtPackVM_VMPowerOn(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
    7470//
    7571// /**
    76 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM}
     72//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnVMPowerOff}
    7773//  */
    78 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
     74// static DECLCALLBACK(void) vboxSkeletonExtPackVM_VMPowerOff(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
    7975//
    8076// /**
    81 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOn}
     77//  * @interface_method_impl{VBOXEXTPACKVMREG,pfnQueryObject}
    8278//  */
    83 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMPowerOn(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    84 // /**
    85 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
    86 //  */
    87 // static DECLCALLBACK(void) vboxSkeletonExtPack_VMPowerOff(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    88 // /**
    89 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
    90 //  */
    91 // static DECLCALLBACK(void) vboxSkeletonExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
     79// static DECLCALLBACK(void) vboxSkeletonExtPackVM_QueryObject(PCVBOXEXTPACKVMREG pThis, PCRTUUID pObjectId);
    9280
    9381
    94 static const VBOXEXTPACKREG g_vboxSkeletonExtPackReg =
     82static const VBOXEXTPACKVMREG g_vboxSkeletonExtPackVMReg =
    9583{
    96     VBOXEXTPACKREG_VERSION,
     84    VBOXEXTPACKVMREG_VERSION,
    9785    /* .uVBoxFullVersion =  */  VBOX_FULL_VERSION,
    98     /* .pfnInstalled =      */  NULL,
    99     /* .pfnUninstall =      */  NULL,
    100     /* .pfnVirtualBoxReady =*/  NULL,
    10186    /* .pfnConsoleReady =   */  NULL,
    10287    /* .pfnUnload =         */  NULL,
    103     /* .pfnVMCreated =      */  NULL,
    10488    /* .pfnVMConfigureVMM = */  NULL,
    10589    /* .pfnVMPowerOn =      */  NULL,
    … …  
    11397    /* .pfnReserved6 =      */  NULL,
    11498    /* .u32Reserved7 =      */  0,
    115     VBOXEXTPACKREG_VERSION
     99    VBOXEXTPACKVMREG_VERSION
    116100};
    117101
    118102
    119 /** @callback_method_impl{FNVBOXEXTPACKREGISTER}  */
    120 extern "C" DECLEXPORT(int) VBoxExtPackRegister(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKREG *ppReg, PRTERRINFO pErrInfo)
     103/** @callback_method_impl{FNVBOXEXTPACKVMREGISTER}  */
     104extern "C" DECLEXPORT(int) VBoxExtPackVMRegister(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKVMREG *ppReg, PRTERRINFO pErrInfo)
    121105{
    122106    /*
    … …  
    139123     */
    140124    g_pHlp = pHlp;
    141     *ppReg = &g_vboxSkeletonExtPackReg;
     125    *ppReg = &g_vboxSkeletonExtPackVMReg;
    142126
    143127    return VINF_SUCCESS;

  • trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceMain.cpp

    r62496 r68828  
    55
    66/*
    7  * Copyright (C) 2010-2016 Oracle Corporation
     7 * Copyright (C) 2010-2017 Oracle Corporation
    88 *
    99 * Permission is hereby granted, free of charge, to any person
    … …  
    3737#include <VBox/err.h>
    3838#include <VBox/version.h>
    39 #include <VBox/vmm/cfgm.h>
    4039#include <iprt/string.h>
    4140#include <iprt/param.h>
    … …  
    5352//  * @interface_method_impl{VBOXEXTPACKREG,pfnInstalled}
    5453//  */
    55 // static DECLCALLBACK(void) vboxSkeletonExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     54// static DECLCALLBACK(void) vboxDTraceExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, PRTERRINFO pErrInfo);
     55//
    5656// /**
    5757//  * @interface_method_impl{VBOXEXTPACKREG,pfnUninstall}
    5858//  */
    59 // static DECLCALLBACK(int)  vboxSkeletonExtPack_Uninstall(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     59// static DECLCALLBACK(int)  vboxDTraceExtPack_Uninstall(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
    6060//
    6161// /**
    6262//  * @interface_method_impl{VBOXEXTPACKREG,pfnVirtualBoxReady}
    6363//  */
    64 // static DECLCALLBACK(void)  vboxSkeletonExtPack_VirtualBoxReady(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     64// static DECLCALLBACK(void)  vboxDTraceExtPack_VirtualBoxReady(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
    6565//
    6666// /**
    6767//  * @interface_method_impl{VBOXEXTPACKREG,pfnUnload}
    6868//  */
    69 // static DECLCALLBACK(void) vboxSkeletonExtPack_Unload(PCVBOXEXTPACKREG pThis);
     69// static DECLCALLBACK(void) vboxDTraceExtPack_Unload(PCVBOXEXTPACKREG pThis);
     70//
    7071// /**
    7172//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMCreated}
    7273//  */
    73 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, IMachine *pMachine);
     74// static DECLCALLBACK(int)  vboxDTraceExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, VBOXEXTPACK_IF_CS(IMachine) *pMachine);
    7475//
    7576// /**
    76 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM}
     77//  * @interface_method_impl{VBOXEXTPACKREG,pfnQueryObject}
    7778//  */
    78 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    79 //
    80 // /**
    81 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOn}
    82 //  */
    83 // static DECLCALLBACK(int)  vboxSkeletonExtPack_VMPowerOn(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    84 // /**
    85 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
    86 //  */
    87 // static DECLCALLBACK(void) vboxSkeletonExtPack_VMPowerOff(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    88 // /**
    89 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
    90 //  */
    91 // static DECLCALLBACK(void) vboxSkeletonExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
     79// static DECLCALLBACK(void) vboxDTraceExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
    9280
    9381
    94 static const VBOXEXTPACKREG g_vboxSkeletonExtPackReg =
     82static const VBOXEXTPACKREG g_vboxDTraceExtPackReg =
    9583{
    9684    VBOXEXTPACKREG_VERSION,
    … …  
    9987    /* .pfnUninstall =      */  NULL,
    10088    /* .pfnVirtualBoxReady =*/  NULL,
    101     /* .pfnConsoleReady =   */  NULL,
    10289    /* .pfnUnload =         */  NULL,
    10390    /* .pfnVMCreated =      */  NULL,
    104     /* .pfnVMConfigureVMM = */  NULL,
    105     /* .pfnVMPowerOn =      */  NULL,
    106     /* .pfnVMPowerOff =     */  NULL,
    10791    /* .pfnQueryObject =    */  NULL,
    10892    /* .pfnReserved1 =      */  NULL,
    … …  
    139123     */
    140124    g_pHlp = pHlp;
    141     *ppReg = &g_vboxSkeletonExtPackReg;
     125    *ppReg = &g_vboxDTraceExtPackReg;
    142126
    143127    return VINF_SUCCESS;

  • trunk/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp

    r62496 r68828  
    55
    66/*
    7  * Copyright (C) 2010-2016 Oracle Corporation
     7 * Copyright (C) 2010-2017 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2424#include <VBox/err.h>
    2525#include <VBox/version.h>
    26 #include <VBox/vmm/cfgm.h>
    2726#include <iprt/string.h>
    2827#include <iprt/param.h>
    … …  
    4039//  * @interface_method_impl{VBOXEXTPACKREG,pfnInstalled}
    4140//  */
    42 // static DECLCALLBACK(void) vboxVNCExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     41// static DECLCALLBACK(void) vboxVNCExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, PRTERRINFO pErrInfo);
     42//
    4343// /**
    4444//  * @interface_method_impl{VBOXEXTPACKREG,pfnUninstall}
    … …  
    5555//  */
    5656// static DECLCALLBACK(void) vboxVNCExtPack_Unload(PCVBOXEXTPACKREG pThis);
     57//
    5758// /**
    5859//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMCreated}
    5960//  */
    60 // static DECLCALLBACK(int)  vboxVNCExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, IMachine *pMachine);
     61// static DECLCALLBACK(int)  vboxVNCExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, VBOXEXTPACK_IF_CS(IMachine) *pMachine);
    6162//
    6263// /**
    63 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM}
    64 //  */
    65 // static DECLCALLBACK(int)  vboxVNCExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    66 //
    67 // /**
    68 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOn}
    69 //  */
    70 // static DECLCALLBACK(int)  vboxVNCExtPack_VMPowerOn(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    71 // /**
    72 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
    73 //  */
    74 // static DECLCALLBACK(void) vboxVNCExtPack_VMPowerOff(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
    75 // /**
    76 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
     64//  * @interface_method_impl{VBOXEXTPACKREG,pfnQueryObject}
    7765//  */
    7866// static DECLCALLBACK(void) vboxVNCExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
    … …  
    8674    /* .pfnUninstall =      */  NULL,
    8775    /* .pfnVirtualBoxReady =*/  NULL,
    88     /* .pfnConsoleReady =   */  NULL,
    8976    /* .pfnUnload =         */  NULL,
    9077    /* .pfnVMCreated =      */  NULL,
    91     /* .pfnVMConfigureVMM = */  NULL,
    92     /* .pfnVMPowerOn =      */  NULL,
    93     /* .pfnVMPowerOff =     */  NULL,
    9478    /* .pfnQueryObject =    */  NULL,
    9579    /* .pfnReserved1 =      */  NULL,
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette