Changeset 65117 in vbox
- Timestamp:
- Jan 4, 2017 5:08:38 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
include/VBox/rawpci.h (modified) (8 diffs)
-
src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/rawpci.h
r62476 r65117 390 390 * 391 391 * @param pPort Pointer to this structure. 392 * @param iRegion Region number. 393 * @param pRegionStart Where to start the region address. 394 * @param pu64RegionSize Where to store the region size. 395 * @param pfPresent Where to store if the region is present. 396 * @param pfFlags Where to store the flags. 392 397 */ 393 398 DECLR0CALLBACKMEMBER(int, pfnGetRegionInfo,(PRAWPCIDEVPORT pPort, … … 403 408 * 404 409 * @param pPort Pointer to this structure. 410 * @param iRegion Region number. 411 * @param RegionStart Region start. 412 * @param u64RegionSize Region size. 413 * @param fFlags Flags. 414 * @param pRegionBaseR0 Where to store the R0 address. 405 415 */ 406 416 DECLR0CALLBACKMEMBER(int, pfnMapRegion,(PRAWPCIDEVPORT pPort, … … 415 425 * 416 426 * @param pPort Pointer to this structure. 427 * @param iRegion Region number. 428 * @param RegionStart Region start. 429 * @param u64RegionSize Region size. 430 * @param RegionBase Base address. 417 431 */ 418 432 DECLR0CALLBACKMEMBER(int, pfnUnmapRegion,(PRAWPCIDEVPORT pPort, … … 496 510 * release it once the pfnCreateAndConnect call(s) has been done. 497 511 * 498 * @param p IfFactoryPointer to this structure.512 * @param pFactory Pointer to this structure. 499 513 */ 500 514 DECLR0CALLBACKMEMBER(void, pfnRelease,(PRAWPCIFACTORY pFactory)); … … 507 521 * @returns VBox status code. 508 522 * 509 * @param p IfFactoryPointer to this structure.523 * @param pFactory Pointer to this structure. 510 524 * @param u32HostAddress Address of PCI device on the host. 511 525 * @param fFlags Creation flags. … … 513 527 * @param ppDevPort Where to store the pointer to the device port 514 528 * on success. 529 * @param pfDevFlags Where to store the device flags. 515 530 * 516 531 */ … … 528 543 * @returns VBox status code. 529 544 * 530 * @param p IfFactoryPointer to this structure.545 * @param pFactory Pointer to this structure. 531 546 * @param pVM The cross context VM structure. 532 * @param p PciDataPointer to PCI data.547 * @param pVmData Pointer to PCI data. 533 548 */ 534 549 DECLR0CALLBACKMEMBER(int, pfnInitVm,(PRAWPCIFACTORY pFactory, 535 550 PVM pVM, 536 PRAWPCIPERVM p PciData));551 PRAWPCIPERVM pVmData)); 537 552 538 553 /** … … 541 556 * @returns VBox status code. 542 557 * 543 * @param p IfFactoryPointer to this structure.558 * @param pFactory Pointer to this structure. 544 559 * @param pVM The cross context VM structure. 545 * @param p PciDataPointer to PCI data.560 * @param pVmData Pointer to PCI data. 546 561 */ 547 562 DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY pFactory, 548 563 PVM pVM, 549 PRAWPCIPERVM p PciData));564 PRAWPCIPERVM pVmData)); 550 565 } RAWPCIFACTORY; 551 566 -
trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c
r62490 r65117 278 278 uint64_t u64RegionSize, 279 279 int32_t fFlags, 280 RTR0PTR *pRegionBase )281 { 282 PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort); 283 int rc; 284 285 vboxPciDevLock(pThis); 286 287 rc = vboxPciOsDevMapRegion(pThis, iRegion, RegionStart, u64RegionSize, fFlags, pRegionBase );280 RTR0PTR *pRegionBaseR0) 281 { 282 PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort); 283 int rc; 284 285 vboxPciDevLock(pThis); 286 287 rc = vboxPciOsDevMapRegion(pThis, iRegion, RegionStart, u64RegionSize, fFlags, pRegionBaseR0); 288 288 289 289 vboxPciDevUnlock(pThis); … … 444 444 * @returns VBox status code. 445 445 * @param pGlobals The globals. 446 * @param pszName The instance name. 446 * @param u32HostAddress Host address. 447 * @param fFlags Flags. 448 * @param pVmCtx VM context. 447 449 * @param ppDevPort Where to store the pointer to our port interface. 450 * @param pfDevFlags The device flags. 448 451 */ 449 452 static int vboxPciNewInstance(PVBOXRAWPCIGLOBALS pGlobals, … … 600 603 static DECLCALLBACK(void) vboxPciFactoryDeinitVm(PRAWPCIFACTORY pFactory, 601 604 PVM pVM, 602 PRAWPCIPERVM p PciData)603 { 604 if (p PciData->pDriverData)605 { 606 PVBOXRAWPCIDRVVM pThis = (PVBOXRAWPCIDRVVM)p PciData->pDriverData;605 PRAWPCIPERVM pVmData) 606 { 607 if (pVmData->pDriverData) 608 { 609 PVBOXRAWPCIDRVVM pThis = (PVBOXRAWPCIDRVVM)pVmData->pDriverData; 607 610 608 611 #ifdef VBOX_WITH_IOMMU … … 619 622 620 623 RTMemFree(pThis); 621 p PciData->pDriverData = NULL;624 pVmData->pDriverData = NULL; 622 625 } 623 626 }
Note:
See TracChangeset
for help on using the changeset viewer.

