From patchwork Tue Oct 19 09:29:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 515950 Delivered-To: patch@linaro.org Received: by 2002:ac0:cd8c:0:0:0:0:0 with SMTP id d12csp445275imp; Tue, 19 Oct 2021 02:30:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2VzmvzgAWi79YNKJrt8/br/dzouTrzt6qYfXC/ZqdB/YeL1y3j/q9qeGVJzmXyzpdDdCz X-Received: by 2002:a02:cd9c:: with SMTP id l28mr3228204jap.78.1634635822271; Tue, 19 Oct 2021 02:30:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634635822; cv=none; d=google.com; s=arc-20160816; b=E4/cekHyqoFIhXes4E0dKrBR0Uzy3RULEiQvOLUZEUoNOZwF1W755Ih6kaajyz8yYV FS3NPrmMgT+uG4w0vR7WJm8dhgmj6gsUnzOacZ5k/QE9Vy2tTK+dPrghAUbNg9W1Memz pI89sJZy38S7V6WLbkchMqLv0cNpNb56K6VHSLQBjt4HzeXWHOD0oon42+nquv+BYGih vMIiN1aqPg165q4k+byxhwlAdyEa/3ZbP/Gi6B7e5G52r41vRUmc4/TovDS+mE9d+Dll xiRKj/VcYPv5lPM8LzPfk+Ax4AxHwquEuryusrcWhvyKuZO77121CyJT9WYSiHz8THXO +vww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=y/uK1jDKTLkid3j4yaxLUFlZ/3QtXdnoxP/si0rXyn0=; b=AlOWeXD+RhO2x0aONm3sw3686WTSqBMR+O+Tl+npAELZz+H8Evnb0jzfA4skomLEr8 /WViY0fgbjT0KieTEI6MM5kfedxQ2MQGIHqsRbYxxhy2vONm1/LItnRWL3jQ1Hggfb/F dGToEdDxGFLAV+cHDTfeGK2NlqpVYp3INLKv4QADAiBXDrkT97GU64KY9JLOIUMAztb8 78TGvLaLWefkxZ8n1oeqYydr2n3+a637XyH4eEBG55SHq9nwz+ha3HP9/Zjab2mUGgen iTmCFaPN3/SK+NlFRY9eb5n8uyiwJitLrWqcde3rkCbdaHgnDztMQYwC94Ciy2uaFuED 4vjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nIksu12Y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x13si23735975jas.93.2021.10.19.02.30.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 02:30:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nIksu12Y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mclRt-0003WF-1S for patch@linaro.org; Tue, 19 Oct 2021 05:30:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mclQk-0003TU-SW for qemu-devel@nongnu.org; Tue, 19 Oct 2021 05:29:10 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:37880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mclQj-0005JW-2P for qemu-devel@nongnu.org; Tue, 19 Oct 2021 05:29:10 -0400 Received: by mail-wm1-x336.google.com with SMTP id n7-20020a05600c4f8700b00323023159e1so1995814wmq.2 for ; Tue, 19 Oct 2021 02:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=y/uK1jDKTLkid3j4yaxLUFlZ/3QtXdnoxP/si0rXyn0=; b=nIksu12YCU+A22rKmAMp6UkyTzdHrN2QSVDvdIHGtxzIt5E95d2Sfrekju8CmK37d0 vrCWKbImPuALSyK98jZMbC7dxtsHW2GRT1MQqBMLl+iCu4Fne54hrg/MDlPPmjUAWIqR 9bN3qGm/ohLp/L1MSdBG3UMsANc0mF/lsSgBHCg2yvFm6XRMqLkpnNILVRhy1uiKWLn9 W6jh4yxWPJ+CbUEbY7uvMTnLpC7hzRC5Rg9+MPWk/0N7LW/geWD2+wZbJn2U+q3GHqrM llfYOh2BdAjJkRB82hmLds+tdhTsUBFyGCQGPYe6dj6fosvHWUQVfxgB7Vy0ja/WR84v 3tyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=y/uK1jDKTLkid3j4yaxLUFlZ/3QtXdnoxP/si0rXyn0=; b=xnTDHQAJ1bx3oZn4WJRW37hlmM5HDsJnRWVa1fvMKcpgdHswV6qUwJSXJBNddAst9u Ro95IA10TTL4ib4a3VbO12D7xYdiXaZl2X3/VGtE05RG/SdS3Y3Y9o4Ab/lhObdMKfxf nMKmlIei75D85fMyBTSZKZAhZJCjZ7JHrOmt2RPVRrnpZc3HdHFAV4xWKNRvHX4IxP8O BZt896UoDak/LxBcVO3x6m0yb2Zg/Nic6HuZUqFYipQbZ20HSJOBXzb/S9KR1CPaRg4k uhMr5OmD4rPC6f9UPCkvjyPDqeRYEsQPDUKD2r9tYMZ1xAQadF30ZIHaLmxNnEPlSRhE Qm+w== X-Gm-Message-State: AOAM5336k3oVAgMN+Fv0Dh4f5HFiwbTKQgRRdGAfRReeSXgyXI2TRuq8 9WVqLo4wNss1RbCqAc8JLvKQJg== X-Received: by 2002:a05:600c:2301:: with SMTP id 1mr4788026wmo.125.1634635747463; Tue, 19 Oct 2021 02:29:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s3sm14582497wrm.40.2021.10.19.02.29.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 02:29:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B57201FF96; Tue, 19 Oct 2021 10:29:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2] chardev: don't exit() straight away on C-a x Date: Tue, 19 Oct 2021 10:29:01 +0100 Message-Id: <20211019092901.1519570-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Lukas_J=C3=BCnger?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While there are a number of uses in the code-base of the exit(0) pattern it gets in the way of clean exit which can do all of it's house-keeping. In particular it was reported that you can crash plugins this way because TCG can still be running on other threads when the atexit callback is called. Use qmp_quit() instead which takes care of some housekeeping before triggering the shutdown. Signed-off-by: Alex Bennée Reported-by: Lukas Jünger Reviewed-by: Marc-André Lureau Message-Id: <20211018140226.838137-1-alex.bennee@linaro.org> --- v2 - use qmp_quit instead of direct qemu_system_shutdown_request - g_assert_not_reached() for the stub definition --- chardev/char-mux.c | 3 ++- stubs/qmp-quit.c | 8 ++++++++ stubs/meson.build | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 stubs/qmp-quit.c -- 2.30.2 Reviewed-by: Philippe Mathieu-Daudé Acked-by: Paolo Bonzini diff --git a/chardev/char-mux.c b/chardev/char-mux.c index ada0c6866f..ee2d47b20d 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -28,6 +28,7 @@ #include "qemu/option.h" #include "chardev/char.h" #include "sysemu/block-backend.h" +#include "qapi/qapi-commands-control.h" #include "chardev-internal.h" /* MUX driver for serial I/O splitting */ @@ -157,7 +158,7 @@ static int mux_proc_byte(Chardev *chr, MuxChardev *d, int ch) { const char *term = "QEMU: Terminated\n\r"; qemu_chr_write_all(chr, (uint8_t *)term, strlen(term)); - exit(0); + qmp_quit(NULL); break; } case 's': diff --git a/stubs/qmp-quit.c b/stubs/qmp-quit.c new file mode 100644 index 0000000000..a3ff47f7bd --- /dev/null +++ b/stubs/qmp-quit.c @@ -0,0 +1,8 @@ +#include "qemu/osdep.h" +#include "qapi/qapi-commands-control.h" +#include "qapi/qmp/dispatch.h" + +void qmp_quit(Error **errp) +{ + g_assert_not_reached(); +} diff --git a/stubs/meson.build b/stubs/meson.build index f6aa3aa94f..71469c1d50 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -31,6 +31,7 @@ stub_ss.add(files('pci-bus.c')) stub_ss.add(files('qemu-timer-notify-cb.c')) stub_ss.add(files('qmp_memory_device.c')) stub_ss.add(files('qmp-command-available.c')) +stub_ss.add(files('qmp-quit.c')) stub_ss.add(files('qtest.c')) stub_ss.add(files('ram-block.c')) stub_ss.add(files('ramfb.c'))