[v1] ivshmem-server: Terminate also on SIGINT

[Qemu-devel] [PATCH] ivshmem-server: Terminate also on SIGINT

Jan Kiszka posted 1 patch 4 years, 8 months ago

Diff against v2
Download mbox

Test checkpatch passed

Test s390x passed

Test asan passed

Test docker-mingw@fedora passed

Test FreeBSD passed

Test docker-clang@ubuntu passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/6976a3e4-d484-56cb-5450-f4a72cc6dddc@web.de

There is a newer version of this series

contrib/ivshmem-server/main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] ivshmem-server: Terminate also on SIGINT

Posted by Jan Kiszka 4 years, 8 months ago

From: Jan Kiszka <jan.kiszka@siemens.com>

Allows to shutdown a foreground session via ctrl-c.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 contrib/ivshmem-server/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c
index 197c79c57e..8a81cdb04c 100644
--- a/contrib/ivshmem-server/main.c
+++ b/contrib/ivshmem-server/main.c
@@ -223,7 +223,8 @@ main(int argc, char *argv[])
     sa_quit.sa_handler = ivshmem_server_quit_cb;
     sa_quit.sa_flags = 0;
     if (sigemptyset(&sa_quit.sa_mask) == -1 ||
-        sigaction(SIGTERM, &sa_quit, 0) == -1) {
+        sigaction(SIGTERM, &sa_quit, 0) == -1 ||
+        sigaction(SIGINT, &sa_quit, 0) == -1) {
         perror("failed to add SIGTERM handler; sigaction");
         goto err;
     }
--
2.16.4

Re: [Qemu-devel] [PATCH] ivshmem-server: Terminate also on SIGINT

Posted by Claudio Fontana 4 years, 8 months ago

On 8/3/19 1:48 PM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Allows to shutdown a foreground session via ctrl-c.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  contrib/ivshmem-server/main.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c
> index 197c79c57e..8a81cdb04c 100644
> --- a/contrib/ivshmem-server/main.c
> +++ b/contrib/ivshmem-server/main.c
> @@ -223,7 +223,8 @@ main(int argc, char *argv[])
>      sa_quit.sa_handler = ivshmem_server_quit_cb;
>      sa_quit.sa_flags = 0;
>      if (sigemptyset(&sa_quit.sa_mask) == -1 ||
> -        sigaction(SIGTERM, &sa_quit, 0) == -1) {
> +        sigaction(SIGTERM, &sa_quit, 0) == -1 ||
> +        sigaction(SIGINT, &sa_quit, 0) == -1) {
>          perror("failed to add SIGTERM handler; sigaction");

I guess the error string should not mention SIGTERM specifically anymore:

perror("failed to add signal handler; sigaction");

>          goto err;
>      }
> --
> 2.16.4
> 
> 

Ciao,

Claudio