← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VBoxBFE/StatusImpl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VBoxBFE/StatusImpl.cpp
128
128
/**
129
129
 * Construct a status driver instance.
130
130
 *
131
 
 * @returns VBox status.
132
 
 * @param   pDrvIns     The driver instance data.
133
 
 *                      If the registration structure is needed, pDrvIns->pDrvReg points to it.
134
 
 * @param   pCfgHandle  Configuration node handle for the driver. Use this to obtain the configuration
135
 
 *                      of the driver instance. It's also found in pDrvIns->pCfgHandle, but like
136
 
 *                      iInstance it's expected to be used a bit in this function.
 
131
 * @copydoc FNPDMDRVCONSTRUCT
137
132
 */
138
 
DECLCALLBACK(int) VMStatus::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
 
133
DECLCALLBACK(int) VMStatus::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
139
134
{
140
135
    PDRVMAINSTATUS pData = PDMINS_2_DATA(pDrvIns, PDRVMAINSTATUS);
141
136
    LogFlow(("VMStatus::drvConstruct: iInstance=%d\n", pDrvIns->iInstance));
145
140
     */
146
141
    if (!CFGMR3AreValuesValid(pCfgHandle, "papLeds\0First\0Last\0"))
147
142
        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
148
 
    PPDMIBASE pBaseIgnore;
149
 
    int rc = pDrvIns->pDrvHlp->pfnAttach(pDrvIns, &pBaseIgnore);
150
 
    if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
151
 
    {
152
 
        AssertMsgFailed(("Configuration error: Not possible to attach anything to this driver!\n"));
153
 
        return VERR_PDM_DRVINS_NO_ATTACH;
154
 
    }
 
143
    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER, 
 
144
                    ("Configuration error: Not possible to attach anything to this driver!\n"),
 
145
                    VERR_PDM_DRVINS_NO_ATTACH);
155
146
 
156
147
    /*
157
148
     * Data.
162
153
    /*
163
154
     * Read config.
164
155
     */
165
 
    rc = CFGMR3QueryPtr(pCfgHandle, "papLeds", (void **)&pData->papLeds);
 
156
    int rc = CFGMR3QueryPtr(pCfgHandle, "papLeds", (void **)&pData->papLeds);
166
157
    if (RT_FAILURE(rc))
167
158
    {
168
159
        AssertMsgFailed(("Configuration error: Failed to query the \"papLeds\" value! rc=%Rrc\n", rc));
243
234
    NULL,
244
235
    /* pfnResume */
245
236
    NULL,
 
237
    /* pfnAttach */
 
238
    NULL,
246
239
    /* pfnDetach */
247
 
    NULL
 
240
    NULL, 
 
241
    /* pfnPowerOff */
 
242
    NULL, 
 
243
    /* pfnSoftReset */
 
244
    NULL,
 
245
    /* u32EndVersion */
 
246
    PDM_DRVREG_VERSION
248
247
};
 
248