Changeset 33540 in vbox for trunk/src/VBox/Devices/Storage
- Timestamp:
- Oct 28, 2010 9:27:05 AM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 67140
- Location:
- trunk/src/VBox/Devices/Storage
- Files:
-
- 29 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Storage/ATAController.cpp
r33486 r33540 1536 1536 do 1537 1537 { 1538 /* don't log superfl ous errors */1538 /* don't log superfluous errors */ 1539 1539 if ( rc == VERR_DEV_IO_ERROR 1540 1540 && ( u8Cmd == SCSI_TEST_UNIT_READY … … 1691 1691 ataH2BE_U16(pbBuf + 0, 6); 1692 1692 pbBuf[2] = 0x04; /* media */ 1693 pbBuf[3] = 0x5e; /* suppor ed = busy|media|external|power|operational */1693 pbBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */ 1694 1694 pbBuf[4] = 0x02; /* new medium */ 1695 1695 pbBuf[5] = 0x02; /* medium present / door closed */ … … 1703 1703 ataH2BE_U16(pbBuf + 0, 6); 1704 1704 pbBuf[2] = 0x04; /* media */ 1705 pbBuf[3] = 0x5e; /* suppor ed = busy|media|external|power|operational */1705 pbBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */ 1706 1706 pbBuf[4] = 0x03; /* media removal */ 1707 1707 pbBuf[5] = 0x00; /* medium absent / door closed */ … … 1726 1726 ataH2BE_U16(pbBuf + 0, 6); 1727 1727 pbBuf[2] = 0x01; /* operational change request / notification */ 1728 pbBuf[3] = 0x5e; /* suppor ed = busy|media|external|power|operational */1728 pbBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */ 1729 1729 pbBuf[4] = 0x00; 1730 1730 pbBuf[5] = 0x00; … … 3882 3882 3883 3883 3884 /** Async hI/O thread for an interface. Once upon a time this was readable3884 /** Async I/O thread for an interface. Once upon a time this was readable 3885 3885 * code with several loops and a different semaphore for each purpose. But 3886 3886 * then came the "how can one save the state in the middle of a PIO transfer" … … 4563 4563 4564 4564 /** 4565 * Reset the controller to an in tial state.4565 * Reset the controller to an initial state. 4566 4566 * 4567 4567 * @returns VBox status. -
trunk/src/VBox/Devices/Storage/ATAController.h
r29758 r33540 177 177 RCPTRTYPE(uint8_t *) pbIOBufferRC; 178 178 179 RTRCPTR Aligmnent1; /**< Align the statistics at an 8-byte bound rary. */179 RTRCPTR Aligmnent1; /**< Align the statistics at an 8-byte boundary. */ 180 180 181 181 /* … … 459 459 460 460 /** 461 * Relocate nec cessary pointers.461 * Relocate necessary pointers. 462 462 * 463 463 * @returns nothing. -
trunk/src/VBox/Devices/Storage/DMGHDDCore.cpp
r33534 r33540 1 1 /* $Id$ */ 2 2 /** @file 3 * VBoxDMG - Inte preter for Apple Disk Images (DMG).3 * VBoxDMG - Interpreter for Apple Disk Images (DMG). 4 4 */ 5 5 … … 151 151 * BLKX data. 152 152 * 153 * This contains the start offset and size of raw data s otred in the image.153 * This contains the start offset and size of raw data stored in the image. 154 154 * 155 155 * All fields are stored in big endian format. … … 1162 1162 1163 1163 /* 1164 * De cend down to the 'resource-fork' dictionary.1164 * Descend down to the 'resource-fork' dictionary. 1165 1165 * ASSUME it's the only top level dictionary. 1166 1166 */ … … 1196 1196 1197 1197 /* 1198 * De cend into the array and add the elements to the resource entry.1198 * Descend into the array and add the elements to the resource entry. 1199 1199 */ 1200 1200 /* <array> */ -
trunk/src/VBox/Devices/Storage/DevAHCI.cpp
r33420 r33540 28 28 * the hard disk and for guests which don't have an AHCI SATA driver. 29 29 * 30 * The data is transfer ed in an asychronous way using one thread per implemented30 * The data is transferred in an asynchronous way using one thread per implemented 31 31 * port or using the new async completion interface which is still under 32 32 * development. [not quite up to date] … … 268 268 /** The command Fis for this task. */ 269 269 uint8_t cmdFis[AHCI_CMDFIS_TYPE_H2D_SIZE]; 270 /** The ATAPI com nmand data. */270 /** The ATAPI command data. */ 271 271 uint8_t aATAPICmd[ATAPI_PACKET_SIZE]; 272 272 /** Size of one sector for the ATAPI transfer. */ … … 2498 2498 * 2499 2499 * @returns nothing 2500 * @param pAhciPort Poi tner to the port the command header was read from.2500 * @param pAhciPort Pointer to the port the command header was read from. 2501 2501 * @param pCmdHdr The command header to print info from. 2502 2502 */ … … 2570 2570 2571 2571 /** 2572 * Post the FIS in the memory area allocated by the guest and set interrupt if nec cessary.2572 * Post the FIS in the memory area allocated by the guest and set interrupt if necessary. 2573 2573 * 2574 2574 * @returns VBox status code … … 3082 3082 ataH2BE_U16(abBuf + 0, 6); 3083 3083 abBuf[2] = 0x04; /* media */ 3084 abBuf[3] = 0x5e; /* suppor ed = busy|media|external|power|operational */3084 abBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */ 3085 3085 abBuf[4] = 0x02; /* new medium */ 3086 3086 abBuf[5] = 0x02; /* medium present / door closed */ … … 3094 3094 ataH2BE_U16(abBuf + 0, 6); 3095 3095 abBuf[2] = 0x04; /* media */ 3096 abBuf[3] = 0x5e; /* suppor ed = busy|media|external|power|operational */3096 abBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */ 3097 3097 abBuf[4] = 0x03; /* media removal */ 3098 3098 abBuf[5] = 0x00; /* medium absent / door closed */ … … 3117 3117 ataH2BE_U16(abBuf + 0, 6); 3118 3118 abBuf[2] = 0x01; /* operational change request / notification */ 3119 abBuf[3] = 0x5e; /* suppor ed = busy|media|external|power|operational */3119 abBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */ 3120 3120 abBuf[4] = 0x00; 3121 3121 abBuf[5] = 0x00; … … 3656 3656 do 3657 3657 { 3658 /* don't log superfl ous errors */3658 /* don't log superfluous errors */ 3659 3659 if ( rc == VERR_DEV_IO_ERROR 3660 3660 && ( u8Cmd == SCSI_TEST_UNIT_READY … … 4805 4805 * @param pAhciPortTaskState The task state which contains the S/G list entries. 4806 4806 * @param fReadonly If the mappings should be readonly. 4807 * @param cSGEntriesProcessed Number of entries the normal creator proce cssed4807 * @param cSGEntriesProcessed Number of entries the normal creator processed 4808 4808 * before an error occurred. Used to free 4809 * any res sources allocated before.4809 * any resources allocated before. 4810 4810 * @thread EMT 4811 4811 */ … … 4926 4926 unsigned cActualSGEntry; 4927 4927 unsigned cSGEntriesR3 = 0; /* Needed scatter gather list entries in R3. */ 4928 unsigned cSGEntriesProcessed = 0; /* Number of SG entries proces ed. */4928 unsigned cSGEntriesProcessed = 0; /* Number of SG entries processed. */ 4929 4929 SGLEntry aSGLEntry[32]; /* Holds read sg entries from guest. Biggest seen number of entries a guest set up. */ 4930 4930 unsigned cSGLEntriesGCRead; … … 5487 5487 * Copy the content of a buffer to a scatter gather list. 5488 5488 * 5489 * @returns Number of bytes transfer ed.5489 * @returns Number of bytes transferred. 5490 5490 * @param pAhciPortTaskState The task state which contains the S/G list entries. 5491 5491 * @param pvBuf Pointer to the buffer which should be copied. … … 5582 5582 5583 5583 /** 5584 * Complete a data transfer task by freeing all occupied res sources5584 * Complete a data transfer task by freeing all occupied resources 5585 5585 * and notifying the guest. 5586 5586 * … … 6284 6284 if (rc == VERR_TIMEOUT) 6285 6285 { 6286 /* No I/O requests in between. Reset statistics and wait again. */6286 /* No I/O requests in-between. Reset statistics and wait again. */ 6287 6287 pAhciPort->StatIORequestsPerSecond.c = 0; 6288 6288 rc = RTSemEventWait(pAhciPort->AsyncIORequestSem, RT_INDEFINITE_WAIT); -
trunk/src/VBox/Devices/Storage/DevATA.cpp
r33486 r33540 227 227 RCPTRTYPE(uint8_t *) pbIOBufferRC; 228 228 229 RTRCPTR Aligmnent1; /**< Align the statistics at an 8-byte bound rary. */229 RTRCPTR Aligmnent1; /**< Align the statistics at an 8-byte boundary. */ 230 230 231 231 /* … … 2073 2073 do 2074 2074 { 2075 /* don't log superfl ous errors */2075 /* don't log superfluous errors */ 2076 2076 if ( rc == VERR_DEV_IO_ERROR 2077 2077 && ( u8Cmd == SCSI_TEST_UNIT_READY … … 2387 2387 ataH2BE_U16(pbBuf + 0, 6); 2388 2388 pbBuf[2] = 0x04; /* media */ 2389 pbBuf[3] = 0x5e; /* suppor ed = busy|media|external|power|operational */2389 pbBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */ 2390 2390 pbBuf[4] = 0x02; /* new medium */ 2391 2391 pbBuf[5] = 0x02; /* medium present / door closed */ … … 2399 2399 ataH2BE_U16(pbBuf + 0, 6); 2400 2400 pbBuf[2] = 0x04; /* media */ 2401 pbBuf[3] = 0x5e; /* suppor ed = busy|media|external|power|operational */2401 pbBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */ 2402 2402 pbBuf[4] = 0x03; /* media removal */ 2403 2403 pbBuf[5] = 0x00; /* medium absent / door closed */ … … 2422 2422 ataH2BE_U16(pbBuf + 0, 6); 2423 2423 pbBuf[2] = 0x01; /* operational change request / notification */ 2424 pbBuf[3] = 0x5e; /* suppor ed = busy|media|external|power|operational */2424 pbBuf[3] = 0x5e; /* supported = busy|media|external|power|operational */ 2425 2425 pbBuf[4] = 0x00; 2426 2426 pbBuf[5] = 0x00; … … 4603 4603 } 4604 4604 4605 /** Async hI/O thread for an interface. Once upon a time this was readable4605 /** Async I/O thread for an interface. Once upon a time this was readable 4606 4606 * code with several loops and a different semaphore for each purpose. But 4607 4607 * then came the "how can one save the state in the middle of a PIO transfer" … … 6157 6157 { 6158 6158 /* 6159 * Setup asynchronous notification comp mletion if the requests haven't6159 * Setup asynchronous notification completion if the requests haven't 6160 6160 * completed yet. 6161 6161 */ … … 7043 7043 { 7044 7044 case VERR_ACCESS_DENIED: 7045 /* Error already ca tched by DrvHostBase */7045 /* Error already cached by DrvHostBase */ 7046 7046 return rc; 7047 7047 default: -
trunk/src/VBox/Devices/Storage/DevBusLogic.cpp
r33274 r33540 89 89 #endif 90 90 91 /** Our base inter ace. */91 /** Our base interface. */ 92 92 PDMIBASE IBase; 93 93 /** SCSI port interface. */ … … 564 564 typedef struct Mailbox 565 565 { 566 /** Physical ad ress of the CCB structure in the guest memory. */566 /** Physical address of the CCB structure in the guest memory. */ 567 567 uint32_t u32PhysAddrCCB; 568 568 /** Type specific data. */ … … 3034 3034 N_("BusLogic: Failed to initialize task cache\n")); 3035 3035 3036 /* In tialize task queue. */3036 /* Initialize task queue. */ 3037 3037 rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 5, 0, 3038 3038 buslogicNotifyQueueConsumer, true, "BugLogicTask", &pThis->pNotifierQueueR3); -
trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp
r33419 r33540 85 85 #endif 86 86 87 /** Our base inter ace. */87 /** Our base interface. */ 88 88 PDMIBASE IBase; 89 89 /** SCSI port interface. */ … … 324 324 325 325 /** 326 * Task state object which holds all nec cessary data while326 * Task state object which holds all necessary data while 327 327 * processing the request from the guest. 328 328 */ … … 433 433 /** 434 434 * Sets a given interrupt status bit in the status register and 435 * updates the inter upt status.435 * updates the interrupt status. 436 436 * 437 437 * @returns nothing. … … 447 447 /** 448 448 * Clears a given interrupt status bit in the status register and 449 * updates the inter upt status.449 * updates the interrupt status. 450 450 * 451 451 * @returns nothing. … … 634 634 635 635 /** 636 * Takes nec cessary steps to finish a reply frame.636 * Takes necessary steps to finish a reply frame. 637 637 * 638 638 * @returns nothing … … 1378 1378 1379 1379 /** 1380 * Copies a contig ous buffer into the scatter gather list provided by the guest.1380 * Copies a contiguous buffer into the scatter gather list provided by the guest. 1381 1381 * 1382 1382 * @returns nothing … … 3123 3123 pPages->pManufacturingPage7 = pManufacturingPage7; 3124 3124 3125 /* SAS I/O unit page 0 - Port specific information s. */3125 /* SAS I/O unit page 0 - Port specific information. */ 3126 3126 pPages->cbSASIOUnitPage0 = LSILOGICSCSI_SASIOUNIT0_GET_SIZE(pThis->cPorts); 3127 3127 PMptConfigurationPageSASIOUnit0 pSASPage0 = (PMptConfigurationPageSASIOUnit0)RTMemAllocZ(pPages->cbSASIOUnitPage0); … … 3147 3147 pPages->pSASIOUnitPage1 = pSASPage1; 3148 3148 3149 /* SAS I/O unit page 2 - Port specific information s. */3149 /* SAS I/O unit page 2 - Port specific information. */ 3150 3150 pPages->SASIOUnitPage2.u.fields.ExtHeader.u8PageType = MPT_CONFIGURATION_PAGE_ATTRIBUTE_READONLY 3151 3151 | MPT_CONFIGURATION_PAGE_TYPE_EXTENDED; … … 3154 3154 pPages->SASIOUnitPage2.u.fields.ExtHeader.u16ExtPageLength = sizeof(MptConfigurationPageSASIOUnit2) / 4; 3155 3155 3156 /* SAS I/O unit page 3 - Port specific information s. */3156 /* SAS I/O unit page 3 - Port specific information. */ 3157 3157 pPages->SASIOUnitPage3.u.fields.ExtHeader.u8PageType = MPT_CONFIGURATION_PAGE_ATTRIBUTE_READONLY 3158 3158 | MPT_CONFIGURATION_PAGE_TYPE_EXTENDED; … … 3365 3365 MPT_CONFIGURATION_PAGE_ATTRIBUTE_PERSISTENT_READONLY); 3366 3366 3367 /* Manufacturing Page 6 - Product s epcific settings. */3367 /* Manufacturing Page 6 - Product specific settings. */ 3368 3368 MPT_CONFIG_PAGE_HEADER_INIT_MANUFACTURING(&pPages->ManufacturingPage6, 3369 3369 MptConfigurationPageManufacturing6, 6, 3370 3370 MPT_CONFIGURATION_PAGE_ATTRIBUTE_CHANGEABLE); 3371 3371 3372 /* Manufacturing Page 8 - Product s epcific settings. */3372 /* Manufacturing Page 8 - Product specific settings. */ 3373 3373 MPT_CONFIG_PAGE_HEADER_INIT_MANUFACTURING(&pPages->ManufacturingPage8, 3374 3374 MptConfigurationPageManufacturing8, 8, 3375 3375 MPT_CONFIGURATION_PAGE_ATTRIBUTE_CHANGEABLE); 3376 3376 3377 /* Manufacturing Page 9 - Product s epcific settings. */3377 /* Manufacturing Page 9 - Product specific settings. */ 3378 3378 MPT_CONFIG_PAGE_HEADER_INIT_MANUFACTURING(&pPages->ManufacturingPage9, 3379 3379 MptConfigurationPageManufacturing9, 9, 3380 3380 MPT_CONFIGURATION_PAGE_ATTRIBUTE_CHANGEABLE); 3381 3381 3382 /* Manufacturing Page 10 - Product s epcific settings. */3382 /* Manufacturing Page 10 - Product specific settings. */ 3383 3383 MPT_CONFIG_PAGE_HEADER_INIT_MANUFACTURING(&pPages->ManufacturingPage10, 3384 3384 MptConfigurationPageManufacturing10, 10, … … 5086 5086 return rc; 5087 5087 5088 /* In tialize task queue. (Need two items to handle SMP guest concurrency.) */5088 /* Initialize task queue. (Need two items to handle SMP guest concurrency.) */ 5089 5089 rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 2, 0, 5090 5090 lsilogicNotifyQueueConsumer, true, -
trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.h
r33115 r33540 93 93 94 94 /** 95 * A simple SG element for a 64bit ad ress.95 * A simple SG element for a 64bit address. 96 96 */ 97 97 #pragma pack(1) … … 104 104 /** Flag whether the address is 32bit or 64bits wide. */ 105 105 unsigned f64BitAddress: 1; 106 /** Flag whether this buffer contains data to be transfer ed or is the destination. */106 /** Flag whether this buffer contains data to be transferred or is the destination. */ 107 107 unsigned fBufferContainsData: 1; 108 108 /** Flag whether this is a local address or a system address. */ … … 123 123 124 124 /** 125 * A simple SG element for a 32bit ad ress.125 * A simple SG element for a 32bit address. 126 126 */ 127 127 #pragma pack(1) … … 134 134 /** Flag whether the address is 32bit or 64bits wide. */ 135 135 unsigned f64BitAddress: 1; 136 /** Flag whether this buffer contains data to be transfer ed or is the destination. */136 /** Flag whether this buffer contains data to be transferred or is the destination. */ 137 137 unsigned fBufferContainsData: 1; 138 138 /** Flag whether this is a local address or a system address. */ … … 497 497 /** Protocol flags. */ 498 498 uint16_t u16ProtocolFlags; 499 /** Max mimum number of target command buffers which can be posted to this port at a time. */499 /** Maximum number of target command buffers which can be posted to this port at a time. */ 500 500 uint16_t u16MaxPostedCmdBuffers; 501 501 /** Maximum number of target IDs that remain persistent between power/reset cycles. */ … … 758 758 /** Sense buffer length. */ 759 759 uint8_t u8SenseBufferLength; 760 /** R served */760 /** Reserved */ 761 761 uint8_t u8Reserved; 762 762 /** Message flags. */ … … 829 829 830 830 /** 831 * IOC status codes s epcific to the SCSI I/O error reply.831 * IOC status codes specific to the SCSI I/O error reply. 832 832 */ 833 833 #define MPT_SCSI_IO_ERROR_IOCSTATUS_INVALID_BUS (0x0041) … … 1039 1039 /** Page number to access. */ 1040 1040 uint8_t u8PageNumber; 1041 /** Type of the page be eing accessed. */1041 /** Type of the page being accessed. */ 1042 1042 uint8_t u8PageType; 1043 1043 /** Page type dependent address. */ … … 1099 1099 /** Page number to access. */ 1100 1100 uint8_t u8PageNumber; 1101 /** Type of the page be eing accessed. */1101 /** Type of the page being accessed. */ 1102 1102 uint8_t u8PageType; 1103 1103 } MptConfigurationReply, *PMptConfigurationReply; … … 1484 1484 /** Enclosure name */ 1485 1485 uint8_t szEnclosureName[16]; 1486 /** Num mber of PHYs */1486 /** Number of PHYs */ 1487 1487 uint8_t u8NumPhys; 1488 1488 /** Reserved */ … … 1779 1779 /** The omnipresent header. */ 1780 1780 MptConfigurationPageHeader Header; 1781 /** Total am mount of NV memory in bytes. */1781 /** Total amount of NV memory in bytes. */ 1782 1782 uint32_t u32TotalNVStore; 1783 1783 /** Number of free bytes in the NV store. */ … … 2247 2247 /** The omnipresent header. */ 2248 2248 MptConfigurationPageHeader Header; 2249 /** Flag whether this port is information unit tr nafsers capable. */2249 /** Flag whether this port is information unit transfers capable. */ 2250 2250 unsigned fInformationUnitTransfersCapable: 1; 2251 2251 /** Flag whether the port is DT (Dual Transfer) capable. */ … … 2511 2511 /** Reserved. */ 2512 2512 unsigned fReserved: 1; 2513 /** Slew reate controler. */2513 /** Slew create controller. */ 2514 2514 unsigned u3SlewRateControler: 3; 2515 /** Primary drive strength control er. */2515 /** Primary drive strength controller. */ 2516 2516 unsigned u3PrimaryDriveStrengthControl: 3; 2517 /** Secondary drive strength control er. */2517 /** Secondary drive strength controller. */ 2518 2518 unsigned u3SecondaryDriveStrengthControl: 3; 2519 2519 /** Reserved. */ … … 2613 2613 /** Nvdata version default */ 2614 2614 uint16_t u16NvdataVersionDefault; 2615 /** Nvdata version persis ent */2615 /** Nvdata version persistent */ 2616 2616 uint16_t u16NvdataVersionPersistent; 2617 2617 /** Number of physical ports */ -
trunk/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp
r30112 r33540 102 102 /** Data for this segment */ 103 103 uint8_t *pbSeg; 104 /** Numb ner of entries in the I/O array. */104 /** Number of entries in the I/O array. */ 105 105 unsigned cIoLogEntries; 106 106 /** Array of I/O log references. */ -
trunk/src/VBox/Devices/Storage/DrvHostBase.cpp
r33464 r33540 592 592 * @param Entry The current I/O registry entry reference. 593 593 * @param pszName Where to store the name. 128 bytes. 594 * @param cRecursions Number of recursions. This is used as an preca tion594 * @param cRecursions Number of recursions. This is used as an precaution 595 595 * just to limit the depth and avoid blowing the stack 596 596 * should we hit a bug or something. … … 809 809 * 810 810 * While there is a (weird 12 byte) GUID, it isn't persistent 811 * ac cross boots. So, we have to use a combination of the811 * across boots. So, we have to use a combination of the 812 812 * vendor name and product name properties with an optional 813 813 * sequence number for identification. … … 1033 1033 * 1034 1034 * Solaris has to deal with two filehandles, a block and a raw one. Rather than messing 1035 * with drvHostBaseOpen's function signature & body, having a sep erate one is better.1035 * with drvHostBaseOpen's function signature & body, having a separate one is better. 1036 1036 * 1037 1037 * @returns VBox status code. … … 1198 1198 1199 1199 /* convert nt status code to VBox status code. */ 1200 /** @todo Make conver tion function!. */1200 /** @todo Make conversion function!. */ 1201 1201 int rc = VERR_GENERAL_FAILURE; 1202 1202 switch (rcNt) … … 1745 1745 #ifdef RT_OS_DARWIN 1746 1746 /* 1747 * The unclaiming doesn't seem to mean much, the DVD is act aully1747 * The unclaiming doesn't seem to mean much, the DVD is actually 1748 1748 * remounted when we release exclusive access. I'm not quite sure 1749 1749 * if I should put the unclaim first or not... … … 1825 1825 1826 1826 /* Leave the instance operational if this is just a cleanup of the state 1827 * after an attach error happened. So don't destr y the critsect then. */1827 * after an attach error happened. So don't destroy the critsect then. */ 1828 1828 if (!pThis->fKeepInstance && RTCritSectIsInitialized(&pThis->CritSect)) 1829 1829 RTCritSectDelete(&pThis->CritSect); -
trunk/src/VBox/Devices/Storage/DrvHostBase.h
r28800 r33540 120 120 /** The disk arbitration session reference. NULL if we didn't have to claim & unmount the device. */ 121 121 DASessionRef pDASession; 122 /** The disk arb ritation disk reference. NULL if we didn't have to claim & unmount the device. */122 /** The disk arbitration disk reference. NULL if we didn't have to claim & unmount the device. */ 123 123 DADiskRef pDADisk; 124 124 #endif -
trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp
r32067 r33540 343 343 || (abSense[12] == 0x3f && abSense[13] == 0 /* target operating conditions have changed */) //??? 344 344 || (abSense[12] == 0x3f && abSense[13] == 2 /* changed operating definition */) //??? 345 || (abSense[12] == 0x3f && abSense[13] == 3 /* inqu ery parameters changed */)345 || (abSense[12] == 0x3f && abSense[13] == 3 /* inquiry parameters changed */) 346 346 || (abSense[12] == 0x3f && abSense[13] == 5 /* device identifier changed */) 347 347 ) … … 653 653 654 654 #ifdef VBOX_WITH_SUID_WRAPPER 655 /* These functions would have to go into a sep erate solaris binary with655 /* These functions would have to go into a separate solaris binary with 656 656 * the setuid permission set, which would run the user-SCSI ioctl and 657 657 * return the value. BUT... this might be prohibitively slow. … … 661 661 /** 662 662 * Checks if the current user is authorized using Solaris' role-based access control. 663 * Made as a sep erate function with so that it need not be invoked each time we need663 * Made as a separate function with so that it need not be invoked each time we need 664 664 * to gain root access. 665 665 * -
trunk/src/VBox/Devices/Storage/DrvSCSI.cpp
r33101 r33540 389 389 * to complete prior to the device reset. 390 390 * 391 * @param pThis Pointer to the insta ce data.391 * @param pThis Pointer to the instance data. 392 392 * @returns VINF_SUCCESS. 393 393 */ … … 402 402 * Request function to wakeup the thread. 403 403 * 404 * @param pThis Pointer to the insta ce data.404 * @param pThis Pointer to the instance data. 405 405 * @returns VWRN_STATE_CHANGED. 406 406 */ -
trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp
r32983 r33540 55 55 PDMISCSICONNECTOR ISCSIConnector; 56 56 57 /** P Ath to the device file. */57 /** Path to the device file. */ 58 58 char *pszDevicePath; 59 59 /** Handle to the device. */ … … 167 167 * 168 168 * @returns transfer direction of the command. 169 * SCSIHOSTTXDIR_NONE if no data is transfer ed.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. -
trunk/src/VBox/Devices/Storage/DrvVD.cpp
r33524 r33540 151 151 VDINTERFACEIO VDIIOCallbacks; 152 152 153 /** Flag whether opened disk supp ports async I/O operations. */153 /** Flag whether opened disk supports async I/O operations. */ 154 154 bool fAsyncIOSupported; 155 155 /** The async media interface. */ … … 1756 1756 * 1757 1757 * This is called both for successful and failed load runs, we only care about 1758 * successful lones.1758 * successful ones. 1759 1759 * 1760 1760 * @returns VBox status code. -
trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp
r33524 r33540 56 56 57 57 58 /** Min umum CHAP_MD5 challenge length in bytes. */58 /** Minimum CHAP_MD5 challenge length in bytes. */ 59 59 #define CHAP_MD5_CHALLENGE_MIN 16 60 60 /** Maximum CHAP_MD5 challenge length in bytes. */ … … 103 103 #define SCSI_DEVTYPE_MASK 0x1f 104 104 105 /** Mask to extract the CmdQue bit out of the seventh byte of the INQUIRY respo sne. */105 /** Mask to extract the CmdQue bit out of the seventh byte of the INQUIRY response. */ 106 106 #define SCSI_INQUIRY_CMDQUE_MASK 0x02 107 107 … … 421 421 typedef struct ISCSICMDSYNC 422 422 { 423 /** Event sem pahore to wakeup the waiting thread. */423 /** Event semaphore to wakeup the waiting thread. */ 424 424 RTSEMEVENT EventSem; 425 425 /** Status code of the command. */ … … 2372 2372 * @return VBOX status code. 2373 2373 * @param pImage The iSCSI connection state to be used. 2374 * @param paRes Pointer to the array of iSCSI re psonse sections.2374 * @param paRes Pointer to the array of iSCSI response sections. 2375 2375 * @param cnRes Number of valid iSCSI response sections in the array. 2376 2376 */ -
trunk/src/VBox/Devices/Storage/UsbMsd.cpp
r32983 r33540 1 1 /* $Id$ */ 2 2 /** @file 3 * UsbMSD - USB Mass Sto age Device Emulation.3 * UsbMSD - USB Mass Storage Device Emulation. 4 4 */ 5 5 … … 226 226 RTSEMEVENTMULTI hEvtReset; 227 227 /** The reset URB. 228 * This is waiting for SCSI request ioncompletion before finishing the reset. */228 * This is waiting for SCSI request completion before finishing the reset. */ 229 229 PVUSBURB pResetUrb; 230 230 … … 1075 1075 1076 1076 /* 1077 * Make sure we've got a request and a suffic ent buffer space.1077 * Make sure we've got a request and a sufficient buffer space. 1078 1078 * 1079 1079 * Note! This will make sure the buffer is ZERO as well, thus -
trunk/src/VBox/Devices/Storage/VBoxHDD.cpp
r33524 r33540 316 316 /** Saved transfer size */ 317 317 size_t cbTransferLeftSaved; 318 /** Number of bytes transfer ed from the parent if this context completes. */318 /** Number of bytes transferred from the parent if this context completes. */ 319 319 size_t cbTransferParent; 320 320 /** Number of bytes to pre read */ … … 373 373 struct 374 374 { 375 /** Number of bytes this task transfer ed. */375 /** Number of bytes this task transferred. */ 376 376 uint32_t cbTransfer; 377 377 /** Pointer to the I/O context the task belongs. */ … … 703 703 * On success this indicates the number of bytes read from the cache. 704 704 * If VERR_VD_BLOCK_FREE is returned this gives the number of bytes 705 * whi h are not in the cache.705 * which are not in the cache. 706 706 * In both cases everything beyond this value 707 707 * might or might not be in the cache. … … 1440 1440 else 1441 1441 cbWriteCopy = 0; 1442 /* Figure out how much we cann not read from the image, because1442 /* Figure out how much we cannot read from the image, because 1443 1443 * the last block to write might exceed the nominal size of the 1444 1444 * image for technical reasons. */ … … 1502 1502 if (cbPostRead) 1503 1503 { 1504 /* Figure out how much we cann not read from the image, because1504 /* Figure out how much we cannot read from the image, because 1505 1505 * the last block to write might exceed the nominal size of the 1506 1506 * image for technical reasons. */ … … 1673 1673 else 1674 1674 cbWriteCopy = 0; 1675 /* Figure out how much we cann not read from the image, because1675 /* Figure out how much we cannot read from the image, because 1676 1676 * the last block to write might exceed the nominal size of the 1677 1677 * image for technical reasons. */ … … 1869 1869 if (cbPostRead) 1870 1870 { 1871 /* Figure out how much we cann not read from the image, because1871 /* Figure out how much we cannot read from the image, because 1872 1872 * the last block to write might exceed the nominal size of the 1873 1873 * image for technical reasons. */ … … 3595 3595 3596 3596 /** 3597 * Lists the capab lities of a backend indentified by its name.3597 * Lists the capabilities of a backend identified by its name. 3598 3598 * 3599 3599 * @returns VBox status code. … … 4336 4336 /* 4337 4337 * Check that the modification UUID of the cache and last image 4338 * match. If not the image was modified in between without the cache.4338 * match. If not the image was modified in-between without the cache. 4339 4339 * The cache might contain stale data. 4340 4340 */ … … 5522 5522 * Make sure the child is readonly 5523 5523 * for the child -> parent merge direction 5524 * if nec cessary.5524 * if necessary. 5525 5525 */ 5526 5526 if ( nImageFrom > nImageTo … … 6695 6695 * @returns 0 if no image with specified number was not opened. 6696 6696 * @param pDisk Pointer to HDD container. 6697 * @param nImage Image number, coun ds from 0. 0 is always base image of container.6697 * @param nImage Image number, counts from 0. 0 is always base image of container. 6698 6698 */ 6699 6699 VBOXDDU_DECL(uint64_t) VDGetSize(PVBOXHDD pDisk, unsigned nImage) -
trunk/src/VBox/Devices/Storage/VBoxHDDFormats/AppleDiskImage/VBoxDMG.cpp
r33534 r33540 1 1 /* $Id$ */ 2 2 /** @file 3 * VBoxDMG - Inte preter for Apple Disk Images (DMG).3 * VBoxDMG - Interpreter for Apple Disk Images (DMG). 4 4 */ 5 5 … … 789 789 790 790 /* 791 * De cend down to the 'resource-fork' dictionary.791 * Descend down to the 'resource-fork' dictionary. 792 792 * ASSUME it's the only top level dictionary. 793 793 */ … … 823 823 824 824 /* 825 * De cend into the array and add the elements to the resource entry.825 * Descend into the array and add the elements to the resource entry. 826 826 */ 827 827 /* <array> */ … … 906 906 * 907 907 * This worker is really just a construct to avoid gotos and do-break-while-zero 908 * ugl yness.908 * ugliness. 909 909 * 910 910 * @returns VBox status code. -
trunk/src/VBox/Devices/Storage/VBoxSCSI.cpp
r33105 r33540 192 192 pVBoxSCSI->iCDB++; 193 193 194 /* Check if we have all nec cessary command data. */194 /* Check if we have all necessary command data. */ 195 195 if (pVBoxSCSI->iCDB == pVBoxSCSI->cbCDB) 196 196 { -
trunk/src/VBox/Devices/Storage/VCICacheCore.cpp
r33534 r33540 73 73 /** UUID of the image. */ 74 74 RTUUID uuidImage; 75 /** Modif cation UUID for the cache. */75 /** Modification UUID for the cache. */ 76 76 RTUUID uuidModification; 77 77 /** Reserved for future use. */ … … 779 779 780 780 /** 781 * Saves the block map in the cache image. All nec cessary on disk structures781 * Saves the block map in the cache image. All necessary on disk structures 782 782 * are written. 783 783 * -
trunk/src/VBox/Devices/Storage/VDICore.h
r32553 r33540 140 140 /** Image comment. (UTF-8) */ 141 141 char szComment[VDI_IMAGE_COMMENT_SIZE]; 142 /** Offset of Blocks array from the begin ing of image file.142 /** Offset of Blocks array from the beginning of image file. 143 143 * Should be sector-aligned for HDD access optimization. */ 144 144 uint32_t offBlocks; 145 /** Offset of image data from the begin ing of image file.145 /** Offset of image data from the beginning of image file. 146 146 * Should be sector-aligned for HDD access optimization. */ 147 147 uint32_t offData; … … 189 189 /** Image comment. (UTF-8) */ 190 190 char szComment[VDI_IMAGE_COMMENT_SIZE]; 191 /** Offset of blocks array from the begin ing of image file.191 /** Offset of blocks array from the beginning of image file. 192 192 * Should be sector-aligned for HDD access optimization. */ 193 193 uint32_t offBlocks; 194 /** Offset of image data from the begin ing of image file.194 /** Offset of image data from the beginning of image file. 195 195 * Should be sector-aligned for HDD access optimization. */ 196 196 uint32_t offData; -
trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp
r33524 r33540 401 401 static int vdiValidateHeader(PVDIHEADER pHeader) 402 402 { 403 /* Check version-dependen dheader parameters. */403 /* Check version-dependent header parameters. */ 404 404 switch (GET_MAJOR_HEADER_VERSION(pHeader)) 405 405 { … … 2522 2522 } 2523 2523 2524 /* Allocate buffer for overwr ting with zeroes. */2524 /* Allocate buffer for overwriting with zeroes. */ 2525 2525 pvZero = RTMemAllocZ(pImage->cbTotalBlockData); 2526 2526 if (!pvZero) -
trunk/src/VBox/Devices/Storage/VHDHDDCore.cpp
r33524 r33540 63 63 #pragma pack() 64 64 65 /* this really is spelled with only one n */ 65 66 #define VHD_FOOTER_COOKIE "conectix" 66 67 #define VHD_FOOTER_COOKIE_SIZE 8 … … 1038 1039 /* 1039 1040 * The index of the bit in the byte of the data block bitmap. 1040 * The most signif cant bit stands for a lower sector number.1041 * The most significant bit stands for a lower sector number. 1041 1042 */ 1042 1043 uint8_t iBitInByte = (8-1) - (cBlockBitmapEntry % 8); … … 1330 1331 ? RT_H2BE_U32(VHD_FOOTER_DISK_TYPE_DIFFERENCING) 1331 1332 : RT_H2BE_U32(VHD_FOOTER_DISK_TYPE_DYNAMIC); 1332 /* We are half way tho urgh with creation of image, let the caller know. */1333 /* We are half way thorough with creation of image, let the caller know. */ 1333 1334 if (pfnProgress) 1334 1335 pfnProgress(pvUser, (uPercentStart + uPercentSpan) / 2); … … 2868 2869 uint64_t offStartDataOld = ~0ULL; 2869 2870 2870 /* Go through the BAT and find ethe data start offset. */2871 /* Go through the BAT and find the data start offset. */ 2871 2872 for (unsigned idxBlock = 0; idxBlock < pImage->cBlockAllocationTableEntries; idxBlock++) 2872 2873 { … … 2910 2911 } 2911 2912 2912 /* Allocate buffer for overwr ting with zeroes. */2913 /* Allocate buffer for overwriting with zeroes. */ 2913 2914 pvZero = RTMemAllocZ(cbBlock); 2914 2915 if (!pvZero) -
trunk/src/VBox/Devices/Storage/VSCSI/VSCSIInternal.h
r32983 r33540 184 184 185 185 /** 186 * Completes a SCSI request and calls the completion handler.186 * Completes a SCSI request and calls the completion handler. 187 187 * 188 188 * @returns nothing. … … 261 261 * Enqueues a new flush request 262 262 * 263 * @ret runs VBox status code.263 * @returns VBox status code. 264 264 * @param pVScsiLun The LUN instance which issued the request. 265 265 * @param pVScsiReq The virtual SCSI request associated with the flush. -
trunk/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp
r28800 r33540 88 88 * 89 89 * @returns VBox status code. 90 * @param hVScsiLun The virt al SCSI LUN handle to destroy.90 * @param hVScsiLun The virtual SCSI LUN handle to destroy. 91 91 */ 92 92 VBOXDDU_DECL(int) VSCSILunDestroy(VSCSILUN hVScsiLun) -
trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp
r33524 r33540 3813 3813 size_t cbBasenameSubstr = strlen(pszBasenameSubstr) + 1; 3814 3814 3815 /* Create se arate descriptor file if necessary. */3815 /* Create separate descriptor file if necessary. */ 3816 3816 if (cExtents != 1 || (uImageFlags & VD_IMAGE_FLAGS_FIXED)) 3817 3817 { … … 3966 3966 /* The spec says version is 1 for all VMDKs, but the vast 3967 3967 * majority of streamOptimized VMDKs actually contain 3968 * version 3 - so go with the majority. Both are ac epted. */3968 * version 3 - so go with the majority. Both are accepted. */ 3969 3969 pExtent->uVersion = 3; 3970 3970 pExtent->uCompression = VMDK_COMPRESSION_DEFLATE; … … 4110 4110 /* The spec says version is 1 for all VMDKs, but the vast 4111 4111 * majority of streamOptimized VMDKs actually contain 4112 * version 3 - so go with the majority. Both are ac epted. */4112 * version 3 - so go with the majority. Both are accepted. */ 4113 4113 pExtent->uVersion = 3; 4114 4114 pExtent->uCompression = VMDK_COMPRESSION_DEFLATE; -
trunk/src/VBox/Devices/Storage/fdc.c
r31128 r33540 2296 2296 cur_drv->last_sect = fdctrl->fifo[3]; 2297 2297 #endif 2298 /* Bochs BIOS is buggy and don't send format information s2298 /* Bochs BIOS is buggy and don't send format information 2299 2299 * for each sector. So, pretend all's done right now... 2300 2300 */ … … 2620 2620 switch (rc) { 2621 2621 case VERR_ACCESS_DENIED: 2622 /* Error already ca tched by DrvHostBase */2622 /* Error already cached by DrvHostBase */ 2623 2623 break; 2624 2624 case VERR_PDM_NO_ATTACHED_DRIVER: -
trunk/src/VBox/Devices/Storage/testcase/tstVDCopy.cpp
r33524 r33540 145 145 { 146 146 RTPrintf("tstVDCopy: Images differ uOffCurr=%llu\n", uOffCurr); 147 /* Do byte by byte com aprison. */147 /* Do byte by byte comparison. */ 148 148 for (size_t i = 0; i < cbRead; i++) 149 149 {
Note:
See TracChangeset
for help on using the changeset viewer.