From nobody Sat Nov 1 22:28:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527597407250613.769530406625; Tue, 29 May 2018 05:36:47 -0700 (PDT) Received: from localhost ([::1]:60914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNdrq-0006ze-D3 for importer@patchew.org; Tue, 29 May 2018 08:36:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNXZq-0002jI-NG for qemu-devel@nongnu.org; Tue, 29 May 2018 01:53:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNXZm-0007GS-ON for qemu-devel@nongnu.org; Tue, 29 May 2018 01:53:46 -0400 Received: from gg-0.genua.de ([80.154.94.10]:1692 helo=gg.genua.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fNXZm-0007EO-Hh for qemu-devel@nongnu.org; Tue, 29 May 2018 01:53:42 -0400 Received: from gg.genua.de (localhost [127.0.0.1]) by gg.genua.de (Postfix) with ESMTP id D3BD679B882 for ; Tue, 29 May 2018 07:53:30 +0200 (CEST) Received: (from localhost) by gg.genua.de (MSCAN) id 3/gg.genua.de/smtp-gw/mscan; Tue May 29 07:53:30 2018 From: Christian Ludwig To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 07:53:12 +0200 Message-Id: <20180529055312.29633-1-christian_ludwig@genua.de> X-Mailer: git-send-email 2.17.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.154.94.10 X-Mailman-Approved-At: Tue, 29 May 2018 08:34:11 -0400 Subject: [Qemu-devel] [PATCH] qemu: Emit RESET event with -no-reboot option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Ludwig Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When -no-reboot is given on the command line, qemu quits when the guest finishes a system reboot operation. This is done by indicating that the system should shut down, rather than reset. A user who observes QMP events only sees a SHUTDOWN event and thus cannot distinguish whether the guest initiated a shutdown or a reboot operation. With -no-reboot set, set flags for system shutdown and system reset now. The system shutdown path will continue to tear down and clean up the guest to exit the application. But in the shutdown path, emit a REBOOT event if the reboot flag is set. Signed-off-by: Christian Ludwig --- vl.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/vl.c b/vl.c index 038d7f8042..4057d3382c 100644 --- a/vl.c +++ b/vl.c @@ -1778,9 +1778,7 @@ void qemu_system_reset_request(ShutdownCause reason) { if (no_reboot) { shutdown_requested =3D reason; - } else { - reset_requested =3D reason; - } + reset_requested =3D reason; cpu_stop_current(); qemu_notify_event(); } @@ -1885,7 +1883,9 @@ void qemu_system_debug_request(void) static bool main_loop_should_exit(void) { RunState r; - ShutdownCause request; + ShutdownCause shutdown_request; + ShutdownCause reset_request; + bool from_guest; =20 if (qemu_debug_requested()) { vm_stop(RUN_STATE_DEBUG); @@ -1893,21 +1893,27 @@ static bool main_loop_should_exit(void) if (qemu_suspend_requested()) { qemu_system_suspend(); } - request =3D qemu_shutdown_requested(); - if (request) { + shutdown_request =3D qemu_shutdown_requested(); + if (shutdown_request) { qemu_kill_report(); - qapi_event_send_shutdown(shutdown_caused_by_guest(request), - &error_abort); + reset_request =3D qemu_reset_requested(); + if (reset_request) { + from_guest =3D shutdown_caused_by_guest(reset_request); + qapi_event_send_reset(from_guest, &error_abort); + } else { + from_guest =3D shutdown_caused_by_guest(shutdown_request); + qapi_event_send_shutdown(from_guest, &error_abort); + } if (no_shutdown) { vm_stop(RUN_STATE_SHUTDOWN); } else { return true; } } - request =3D qemu_reset_requested(); - if (request) { + reset_request =3D qemu_reset_requested(); + if (reset_request) { pause_all_vcpus(); - qemu_system_reset(request); + qemu_system_reset(reset_request); resume_all_vcpus(); if (!runstate_check(RUN_STATE_RUNNING) && !runstate_check(RUN_STATE_INMIGRATE)) { --=20 2.17.0