Return error when no va devices available. #369
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
FYI, this is for fixing a regression introduced by 6650b39, The current code without this fix crashes on system without supported hardware (for example, inside an vm). |
va/drm/va_drm_utils.c
Outdated
| @@ -69,7 +69,7 @@ VA_DRM_GetNumCandidates(VADriverContextP ctx, int * num_candidates) | |||
| } | |||
| drmFreeVersion(drm_version); | |||
| *num_candidates = num_of_candidate; | |||
| return VA_STATUS_SUCCESS; | |||
| return num_of_candidate ? VA_STATUS_SUCCESS : VA_STATUS_ERROR_UNKNOWN; | |||
There was a problem hiding this comment.
no:). num_of_candidate is local variable declared int. num_candidates is function argument declared int*. I would suggest to use simpler and more different names to avoid misreading:).
There was a problem hiding this comment.
So should I roll back to original version?
There was a problem hiding this comment.
OK, now I changed num_of_candidate to count in my cl.
Please take another look, thanks!
LeptonWu
force-pushed
the
fixnum
branch
2 times, most recently
from
c71ceec to
5b3c668
Compare
|
Ping, any comments? Thanks |
|
LGTM, will merge it |
XinfengZhang
approved these changes
Feb 24, 2020
|
@LeptonWu please help to re-base it with latest code |
Signed-off-by: Lepton Wu <ytht.net@gmail.com>
|
Thanks, can we get this merge now? |
Merged
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Lepton Wu ytht.net@gmail.com