david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ivshmem-server: Clean up shmem on shutdown

Browse Source 
So far, the server leaves the posix shared memory object behind when
terminating, requiring the user to explicitly remove it in order to
start a new instance.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Claudio Fontana <claudio.fontana@suse.com>
Message-Id: <d938a62c-7538-9d2b-cc0a-13b240ab9141@web.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Jan Kiszka 2019-08-05 07:54:52 +02:00 committed by Laurent Vivier
parent 88ed5db16c
commit 0602a6166d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/ivshmem-server/ivshmem-server.c
View File

@ -353,6 +353,9 @@ ivshmem_server_start(IvshmemServer *server)
err_close_sock: err_close_sock:
close(sock_fd); close(sock_fd);
err_close_shm: err_close_shm:
if (server->use_shm_open) {
shm_unlink(server->shm_path);
}
close(shm_fd); close(shm_fd);
return -1; return -1;
} }
@ -370,6 +373,9 @@ ivshmem_server_close(IvshmemServer *server)
} }
unlink(server->unix_sock_path); unlink(server->unix_sock_path);
if (server->use_shm_open) {
shm_unlink(server->shm_path);
}
close(server->sock_fd); close(server->sock_fd);
close(server->shm_fd); close(server->shm_fd);
server->sock_fd = -1; server->sock_fd = -1;