From patchwork Tue Nov 12 10:04:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11238985 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D1AA214E5 for ; Tue, 12 Nov 2019 10:08:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E8AA21783 for ; Tue, 12 Nov 2019 10:08:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E8AA21783 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:32842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT6N-0007NU-Gj for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Nov 2019 05:08:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53715) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT4n-0004lp-IW for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:07:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUT4m-0003FE-Ig for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:07:09 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:48959) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUT4g-0003DP-By; Tue, 12 Nov 2019 05:07:02 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MILru-1iip1u0vUC-00EMBo; Tue, 12 Nov 2019 11:04:38 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 5/5] ivshmem-server: Terminate also on SIGINT Date: Tue, 12 Nov 2019 11:04:29 +0100 Message-Id: <20191112100429.11957-6-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191112100429.11957-1-laurent@vivier.eu> References: <20191112100429.11957-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:lCdy1/ah0HDEBjmlm8KfY2Kri3NDqzdrhbdMmkirTMD8Q241Yy+ kOMsT65UfB/3jxREvRcwDw7V4uLVkqBaXGhxLk9V471bqaFEzwl8gMsgDz2p9/2QN4Xj34O Oq5T4xpd13/C+CsAGdYIPamYPPd7/uEdn9JKIKasJ7XT3w7CbEvL9+Wg6vSncFb9bhGXz4X yVsio5+nEL+cgE4SdJ6pg== X-UI-Out-Filterresults: notjunk:1;V03:K0:nT1R0aW2zw0=:O4k4rXb9MR9LTPv9YHBj4s b4x5FJmGzhdxoUZiZZDrP7+gyKr88c3Ig01yAtSBXdqXcgQlukE+/UoW4mHQQ3Y7UjWgLfJvQ UsFk6wYYpuWTg/71cV68IVzTSFSAtQj8667WL2XzgQ8CJ1LtQaoFlzSI72i8MmthitoOXAUzd XMKOgt72E0Nq6xo2wOYMJfCRuqbId03vDxjyNcI+KT+bVvmS4mtqYYST0g1iMvZG/M+UT2zVQ 6UFtvfIoeVnYRh4u62KhHo3lgWLqYybbWgtDp0n1T1gbb7tlnXgbgH5Pa0gvChvGv07cqXdNC x0ahzoDwiueTt2hUpl6wH031/YiSAK5Xor03kBah1NyHrwx4sO06HnhQWWZj7GNKlOGAozQta rPkQ5foSAikwhUsf9ButLiKYMOYEJJfQP5RXwmoP0CjIvjPxJdecULMmBFiHeEAuVWGE+83km gBQPsIfuVEv1v9B32tXmeiLtFADfpTRM1cnNgIuDNwX+YIK2RatG4OQO4d8kGhppSqnrs8T0O hY5xijT90G4D0cqR07lnVGP/cqjsCV9vssEaRZ0I0YNWopaUSdIDZ4yQleKyv6I2Jo3PzGfji ADw7e8si9ehBJfxkvdA6mXXIBHwcl1qzcT84yrHxB4JUCxnIwDx+wko+nfwbjGzE9T2vBTUHl xoqozdn91LoSvFCc5bAUJP6xX2Yf7mlPYmRbZqmoXwDLbHmbpw9mUfMNsA+SXlwcl/cisM2cJ Dzoju9spqmcPE/RlA7bXBVE0CuMgGzkcAMQH7qM9bFDKSBEOp3U7oJlkgsci3nFmwgiYUw8Kx ssE9N1bAGZeVTx0pzsp1gBX8hUK1ZaY5OPDTEra4N5Z90kzvG02nNBchJeNjXEUIPxUZPfgOa ooKQAZzZSmpeeP1cjh8A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org, Jan Kiszka , Michael Tokarev , Laurent Vivier , Claudio Fontana , Paolo Bonzini , Stefano Garzarella Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jan Kiszka Allows to shutdown a foreground session via ctrl-c. Signed-off-by: Jan Kiszka Reviewed-by: Claudio Fontana Reviewed-by: Stefano Garzarella Message-Id: <99c1a7bd-1876-66a2-4b8e-d5bc86116fe7@web.de> Signed-off-by: Laurent Vivier --- contrib/ivshmem-server/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c index 197c79c57ec2..e4cd35f74c61 100644 --- a/contrib/ivshmem-server/main.c +++ b/contrib/ivshmem-server/main.c @@ -223,8 +223,9 @@ 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) { - perror("failed to add SIGTERM handler; sigaction"); + sigaction(SIGTERM, &sa_quit, 0) == -1 || + sigaction(SIGINT, &sa_quit, 0) == -1) { + perror("failed to add signal handler; sigaction"); goto err; }