Changeset 23970 in vbox
- Timestamp:
- Oct 22, 2009 11:24:08 AM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 53797
- Location:
- trunk/src/VBox/Devices
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DevSB16.cpp
r22793 r23970 1739 1739 "Version\0")) 1740 1740 return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES, 1741 N_("Invalid configurat on for sb16 device"));1741 N_("Invalid configuration for sb16 device")); 1742 1742 1743 1743 /* -
trunk/src/VBox/Devices/Network/DevVirtioNet.cpp
r23830 r23970 228 228 { /* Virtio Network Device */ 229 229 0x1AF4, 0x1000, 0x1AF4, 1 + VIRTIO_NET_ID, 0x0200, 3, "virtio-net", "vnet%d", 230 vnetGetHostFeatures, vnetGetHostMinimalFeatures, vnetSetHostFeatures, 230 vnetGetHostFeatures, vnetGetHostMinimalFeatures, vnetSetHostFeatures, 231 231 vnetGetConfig, vnetSetConfig, vnetReset 232 232 #ifdef DEBUG 233 233 , vnetGetQueueName 234 234 #endif /* DEBUG */ 235 }, 235 }, 236 236 { /* Virtio Block Device */ 237 237 0x1AF4, 0x1001, 0x1AF4, 1 + VIRTIO_BLK_ID, 0x0180, 2, "virtio-blk", "vblk%d", … … 240 240 , NULL 241 241 #endif /* DEBUG */ 242 }, 242 }, 243 243 }; 244 244 … … 302 302 { 303 303 uint16_t tmp; 304 304 305 305 PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns), 306 306 pVRing->addrAvail + RT_OFFSETOF(VRINGAVAIL, uNextFreeIndex), … … 334 334 { 335 335 uint16_t tmp; 336 336 337 337 PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns), 338 338 pVRing->addrAvail + RT_OFFSETOF(VRINGAVAIL, auRing[uIndex % pVRing->uSize]), … … 344 344 { 345 345 uint16_t tmp; 346 346 347 347 PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns), 348 348 pVRing->addrAvail + RT_OFFSETOF(VRINGAVAIL, uFlags), … … 354 354 { 355 355 uint16_t tmp; 356 356 357 357 PDMDevHlpPhysRead(pState->CTX_SUFF(pDevIns), 358 358 pVRing->addrUsed + RT_OFFSETOF(VRINGUSED, uFlags), … … 373 373 if (vqueueIsEmpty(pState, pQueue)) 374 374 return false; 375 375 376 376 pElem->nIn = pElem->nOut = 0; 377 377 378 Log2(("%s vqueueGet: %s avail_idx=%u\n", INSTANCE(pState), 378 Log2(("%s vqueueGet: %s avail_idx=%u\n", INSTANCE(pState), 379 379 QUEUENAME(pState, pQueue), pQueue->uNextAvailIndex)); 380 380 … … 989 989 { 990 990 Log(("%s Destroying PCI instance\n", INSTANCE(pState))); 991 991 992 992 if (pState->pQueues) 993 993 RTMemFree(pState->pQueues); … … 1461 1461 } 1462 1462 vqueueSync(&pState->VPCI, pState->pRxQueue); 1463 1463 1464 1464 return VINF_SUCCESS; 1465 1465 } … … 1478 1478 VNETSTATE *pState = IFACE_TO_STATE(pInterface, INetworkPort); 1479 1479 int rc = VINF_SUCCESS; 1480 1480 1481 1481 Log2(("%s vnetReceive: pvBuf=%p cb=%u\n", INSTANCE(pState), pvBuf, cb)); 1482 1482 rc = vnetCanReceive(pState); … … 1605 1605 if (uSize > VNET_MAX_FRAME_SIZE - uOffset) 1606 1606 { 1607 Log(("%s vnetQueueTransmit: Packet is too big (>64k), truncating...\n", INSTANCE(pState))); 1607 Log(("%s vnetQueueTransmit: Packet is too big (>64k), truncating...\n", INSTANCE(pState))); 1608 1608 uSize = VNET_MAX_FRAME_SIZE - uOffset; 1609 1609 } … … 1665 1665 if (!CFGMR3AreValuesValid(pCfgHandle, "MAC\0" "CableConnected\0" "LineSpeed\0")) 1666 1666 return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES, 1667 N_("Invalid configurat on for VirtioNet device"));1667 N_("Invalid configuration for VirtioNet device")); 1668 1668 1669 1669 /* Get config params */ … … 1769 1769 pState->hEventMoreRxDescAvail = NIL_RTSEMEVENT; 1770 1770 } 1771 1771 1772 1772 return vpciDestruct(&pState->VPCI); 1773 1773 } -
trunk/src/VBox/Devices/PC/DevPcBios.cpp
r23942 r23970 1526 1526 )) 1527 1527 return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES, 1528 N_("Invalid configurat on fordevice pcbios device"));1528 N_("Invalid configuration for device pcbios device")); 1529 1529 1530 1530 /* -
trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp
r22278 r23970 454 454 if (!CFGMR3AreValuesValid(pCfgHandle, "DevicePath\0")) 455 455 return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES, 456 N_("Invalid configurat on for host scsi access driver"));456 N_("Invalid configuration for host scsi access driver")); 457 457 458 458 /* … … 527 527 NULL, 528 528 /* pfnDetach */ 529 NULL, 529 NULL, 530 530 /* pfnPowerOff */ 531 NULL, 531 NULL, 532 532 /* pfnSoftReset */ 533 533 NULL,
Note:
See TracChangeset
for help on using the changeset viewer.