On 8/5/19 7:54 AM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kis...@siemens.com>
>
> 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.kis...@siemens.com>
> ---
>
> Changes in v2:
> - respect use_shm_open
> - also clean up in ivshmem_server_start error path
>
> contrib/ivshmem-server/ivshmem-server.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/contrib/ivshmem-server/ivshmem-server.c
> b/contrib/ivshmem-server/ivshmem-server.c
> index 77f97b209c..88daee812d 100644
> --- a/contrib/ivshmem-server/ivshmem-server.c
> +++ b/contrib/ivshmem-server/ivshmem-server.c
> @@ -353,6 +353,9 @@ ivshmem_server_start(IvshmemServer *server)
> err_close_sock:
> close(sock_fd);
> err_close_shm:
> + if (server->use_shm_open) {
> + shm_unlink(server->shm_path);
> + }
> close(shm_fd);
> return -1;
> }
> @@ -370,6 +373,9 @@ ivshmem_server_close(IvshmemServer *server)
> }
>
> unlink(server->unix_sock_path);
> + if (server->use_shm_open) {
> + shm_unlink(server->shm_path);
> + }
> close(server->sock_fd);
> close(server->shm_fd);
> server->sock_fd = -1;
> --
> 2.16.4
>
>
Reviewed-by: Claudio Fontana <claudio.font...@suse.com>
