Changeset 68852 in vbox
- Timestamp:
- Sep 25, 2017 1:01:11 PM (8 years ago)
- svn:sync-xref-src-repo-rev:
- 118106
- Location:
- trunk/src/VBox/Main
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/DisplayImpl.h
r68850 r68852 402 402 /** Pointer to the associated display driver. */ 403 403 struct DRVMAINDISPLAY *mpDrv; 404 /** Pointer to the device instance for the VMM Device. */405 PPDMDEVINS mpVMMDev;406 /** Set after the first attempt to find the VMM Device. */407 bool mfVMMDevInited;408 404 409 405 unsigned mcMonitors; -
trunk/src/VBox/Main/include/KeyboardImpl.h
r62485 r68852 86 86 /** Pointer to the associated keyboard driver(s). */ 87 87 struct DRVMAINKEYBOARD *mpDrv[KEYBOARD_MAX_DEVICES]; 88 /** Pointer to the device instance for the VMM Device. */89 PPDMDEVINS mpVMMDev;90 /** Set after the first attempt to find the VMM Device. */91 bool mfVMMDevInited;92 88 93 89 /* The current guest keyboard LED status. */ -
trunk/src/VBox/Main/src-client/DisplayImpl.cpp
r68835 r68852 132 132 133 133 mpDrv = NULL; 134 mpVMMDev = NULL;135 mfVMMDevInited = false;136 134 137 135 rc = RTCritSectInit(&mVideoAccelLock); … … 747 745 748 746 mpDrv = NULL; 749 mpVMMDev = NULL;750 mfVMMDevInited = true;751 747 } 752 748 … … 4440 4436 #endif 4441 4437 pThis->pDisplay->mpDrv = NULL; 4442 pThis->pDisplay->mpVMMDev = NULL;4443 4438 } 4444 4439 } -
trunk/src/VBox/Main/src-client/KeyboardImpl.cpp
r67914 r68852 79 79 { 80 80 RT_ZERO(mpDrv); 81 mpVMMDev = NULL;82 mfVMMDevInited = false;83 81 menmLeds = PDMKEYBLEDS_NONE; 84 82 return BaseFinalConstruct(); … … 141 139 mpDrv[i] = NULL; 142 140 } 143 144 mpVMMDev = NULL;145 mfVMMDevInited = true;146 141 147 142 menmLeds = PDMKEYBLEDS_NONE; … … 357 352 break; 358 353 } 359 pThis->pKeyboard->mpVMMDev = NULL;360 354 } 361 355 }
Note:
See TracChangeset
for help on using the changeset viewer.