Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few fixes here and there #2280

Merged
merged 5 commits into from
Oct 8, 2023
Merged

Conversation

avagin
Copy link
Member

@avagin avagin commented Oct 8, 2023

No description provided.

Taemin Ha added 5 commits October 7, 2023 22:57
This check is redundant as line 201 checks for this condition.

Signed-off-by: Taemin Ha <[email protected]>
Signed-off-by: Andrei Vagin <[email protected]>
The is_native field is a boolean. Therefore, else if() should can be
changed to a simple else{}.

Signed-off-by: Taemin Ha <[email protected]>
Signed-off-by: Andrei Vagin <[email protected]>
The condition meant to check fd2 instead of fd1, which is checked in
line 24.

Signed-off-by: Taemin Ha <[email protected]>
Signed-off-by: Andrei Vagin <[email protected]>
line 131 checks if (ret >= 0). line 133 could be replaced by a simple else statement

Signed-off-by: Taemin Ha <[email protected]>
Signed-off-by: Andrei Vagin <[email protected]>
Eventpollentry's fields are set only when ret == 3 or ret == 6. The
remaining cases can be grouped together to an error

Signed-off-by: Taemin Ha <[email protected]>
Signed-off-by: Andrei Vagin <[email protected]>
@avagin
Copy link
Member Author

avagin commented Oct 8, 2023

The origin pr is here: #2141

@codecov-commenter
Copy link

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (4e5247a) 70.53% compared to head (1058ff2) 70.53%.

❗ Current head 1058ff2 differs from pull request most recent head d2d40a2. Consider uploading reports for the commit d2d40a2 to get more accurate results

Additional details and impacted files
@@             Coverage Diff              @@
##           criu-dev    #2280      +/-   ##
============================================
- Coverage     70.53%   70.53%   -0.01%     
============================================
  Files           132      132              
  Lines         33512    33507       -5     
============================================
- Hits          23639    23635       -4     
+ Misses         9873     9872       -1     
Files Coverage Δ
criu/apparmor.c 54.15% <ø> (+0.14%) ⬆️
criu/proc_parse.c 68.66% <100.00%> (+0.11%) ⬆️

... and 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@rst0git rst0git left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@avagin avagin merged commit ab73a84 into checkpoint-restore:criu-dev Oct 8, 2023
33 of 37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants