Changeset 1254 in vbox for trunk/src/VBox/Additions
- Timestamp:
- Mar 6, 2007 10:16:21 AM (18 years ago)
- Location:
- trunk/src/VBox/Additions/linux/xgraphics
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/linux/xgraphics/vboxutils.c
r793 r1254 397 397 pVBox->useVbva = FALSE; 398 398 399 if (pVBox->vbox_fd != -1 || pVBox->reqp) 400 { 401 xf86DrvMsg(scrnIndex, X_ERROR, 402 "Error fd=%d reqp=%p\n", pVBox->vbox_fd, 403 (void *) pVBox->reqp); 404 return FALSE; 399 if (pVBox->vbox_fd != -1 && pVBox->reqp) 400 { 401 /* still open, just re-enable VBVA after CloseScreen was called */ 402 pVBox->useVbva = vboxInitVbva(scrnIndex, pScreen, pVBox); 403 return TRUE; 405 404 } 406 405 407 406 fd = open (VBOXGUEST_DEVICE_NAME, O_RDWR, 0); 408 if (fd < 0) { 407 if (fd < 0) 408 { 409 409 xf86DrvMsg(scrnIndex, X_ERROR, 410 410 "Error opening kernel module: %s\n", … … 416 416 417 417 p = xcalloc (1, size); 418 if (!p) { 418 if (!p) 419 { 419 420 xf86DrvMsg(scrnIndex, X_ERROR, 420 421 "Could not allocate %lu bytes for VMM request\n", -
trunk/src/VBox/Additions/linux/xgraphics/vboxvideo.c
r1207 r1254 359 359 { 360 360 if (!pScrn->driverPrivate) 361 pScrn->driverPrivate = xcalloc(sizeof(VBOXRec), 1); 361 { 362 pScrn->driverPrivate = xcalloc(sizeof(VBOXRec), 1); 363 ((VBOXPtr)pScrn->driverPrivate)->vbox_fd = -1; 364 } 362 365 363 366 return ((VBOXPtr)pScrn->driverPrivate); … … 688 691 xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); 689 692 690 pVBox->vbox_fd = -1;691 693 if (vbox_open (pScrn, pScreen, pVBox)) { 692 694 if (vbox_cursor_init(pScreen) != TRUE)
Note:
See TracChangeset
for help on using the changeset viewer.