VirtualBox

Changeset 1254 in vbox for trunk/src/VBox/Additions


Ignore:
Timestamp:
Mar 6, 2007 10:16:21 AM (18 years ago)
Author:
vboxsync
Message:

Fixed an isse when the Xorg server was not restarted after an X session was terminated

Location:
trunk/src/VBox/Additions/linux/xgraphics
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/linux/xgraphics/vboxutils.c

    r793 r1254  
    397397    pVBox->useVbva = FALSE;
    398398
    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;
    405404    }
    406405
    407406    fd = open (VBOXGUEST_DEVICE_NAME, O_RDWR, 0);
    408     if (fd < 0) {
     407    if (fd < 0)
     408    {
    409409        xf86DrvMsg(scrnIndex, X_ERROR,
    410410                   "Error opening kernel module: %s\n",
     
    416416
    417417    p = xcalloc (1, size);
    418     if (!p) {
     418    if (!p)
     419    {
    419420        xf86DrvMsg(scrnIndex, X_ERROR,
    420421                   "Could not allocate %lu bytes for VMM request\n",
  • trunk/src/VBox/Additions/linux/xgraphics/vboxvideo.c

    r1207 r1254  
    359359{
    360360    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    }
    362365
    363366    return ((VBOXPtr)pScrn->driverPrivate);
     
    688691        xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
    689692
    690     pVBox->vbox_fd = -1;
    691693    if (vbox_open (pScrn, pScreen, pVBox)) {
    692694        if (vbox_cursor_init(pScreen) != TRUE)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette