← Back to branch summary

~siretart/ubuntu/raring/virtualbox-ose/bug.1101867

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Storage/DrvSCSIHost.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Storage/DrvSCSIHost.cpp
1
 
/* $Id: DrvSCSIHost.cpp $ */
 
1
/* $Id: DrvSCSIHost.cpp 35353 2010-12-27 17:25:52Z vboxsync $ */
2
2
/** @file
3
3
 * VBox storage drivers: Host SCSI access driver.
4
4
 */
20
20
*******************************************************************************/
21
21
//#define DEBUG
22
22
#define LOG_GROUP LOG_GROUP_DRV_SCSIHOST
23
 
#include <VBox/pdmdrv.h>
24
 
#include <VBox/pdmifs.h>
25
 
#include <VBox/pdmthread.h>
 
23
#include <VBox/vmm/pdmdrv.h>
 
24
#include <VBox/vmm/pdmifs.h>
 
25
#include <VBox/vmm/pdmthread.h>
26
26
#include <VBox/scsi.h>
27
27
#include <iprt/assert.h>
28
28
#include <iprt/file.h>
37
37
# include <sys/ioctl.h>
38
38
#endif
39
39
 
40
 
#include "../Builtins.h"
 
40
#include "VBoxDD.h"
41
41
 
42
42
/**
43
43
 * SCSI driver instance data.
54
54
    /** The SCSI connector interface .   */
55
55
    PDMISCSICONNECTOR       ISCSIConnector;
56
56
 
57
 
    /** PAth to the device file. */
 
57
    /** Path to the device file. */
58
58
    char                   *pszDevicePath;
59
59
    /** Handle to the device. */
60
60
    RTFILE                  DeviceFile;
166
166
 * in case the device does not provide this info.
167
167
 *
168
168
 * @returns transfer direction of the command.
169
 
 *          SCSIHOSTTXDIR_NONE if no data is transfered.
 
169
 *          SCSIHOSTTXDIR_NONE if no data is transferred.
170
170
 *          SCSIHOSTTXDIR_FROM_DEVICE if the data is read from the device.
171
171
 *          SCSIHOSTTXDIR_TO_DEVICE   if the data is written to the device.
172
172
 * @param   uCommand The command byte.
315
315
#endif
316
316
    }
317
317
    /* Notify device that request finished. */
318
 
    rc = pThis->pDevScsiPort->pfnSCSIRequestCompleted(pThis->pDevScsiPort, pRequest, SCSI_STATUS_OK);
 
318
    rc = pThis->pDevScsiPort->pfnSCSIRequestCompleted(pThis->pDevScsiPort, pRequest, SCSI_STATUS_OK, false, VINF_SUCCESS);
319
319
    AssertMsgRC(rc, ("Notifying device above failed rc=%Rrc\n", rc));
320
320
 
321
321
    return rc;