Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-17 16:47:50 +00:00
Code Issues Projects Releases Wiki Activity

plugins/amdgpu: Avoid shadowing the minor local in DRM dump file

Browse source 
The DRM minor local variable is shadowed between two blocks inside
amdgpu_plugin_drm_dump_file(). If at the top level we access the minor via
the copy stored in the protobuf image, we can simply drop this copy and
so avoid the buffer object dump loop shadowing it.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
This commit is contained in:
Tvrtko Ursulin 2026-05-05 09:37:05 +01:00 • committed by Andrei Vagin
parent 822f54f3c6
commit f7e06589a4
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/amdgpu/amdgpu_plugin_drm.c
View file

@ -243,9 +243,7 @@ int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
char path[PATH_MAX];
CriuRenderNode *rd;
unsigned char *buf;
int minor;
int len;
int ret;
int len, ret;
size_t image_size;
struct tp_node *tp_node;
struct drm_amdgpu_gem_list_handles list_handles_args = { 0 };
@ -259,8 +257,7 @@ int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
criu_render_node__init(rd);
/* Get the topology node of the DRM device */
minor = minor(drm->st_rdev);
rd->drm_render_minor = minor;
rd->drm_render_minor = minor(drm->st_rdev);
rd->id = id;
num_bos = 8;
@ -454,9 +451,10 @@ int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
goto exit;
}
tp_node = sys_get_node_by_render_minor(&src_topology, minor);
tp_node = sys_get_node_by_render_minor(&src_topology, rd->drm_render_minor);
if (!tp_node) {
pr_err("Failed to find a device with minor number = %d\n", minor);
pr_err("Failed to find a device with minor number = %d\n",
rd->drm_render_minor);
return -ENODEV;
}