[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 5/9] Monitor: Return before exiting with 'quit'
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] Re: [PATCH 5/9] Monitor: Return before exiting with 'quit' |
Date: |
Mon, 26 Apr 2010 16:44:48 -0300 |
On Mon, 26 Apr 2010 14:13:40 -0500
Anthony Liguori <address@hidden> wrote:
> On 04/26/2010 02:10 PM, Jan Kiszka wrote:
> >
> > Just suspend the monitor before leaving for termination. That should
> > have both the proper visual and functional effect.
> >
>
> Very good idea.
Yeah, works great.
Final version of the patch below, for-anthony branch updated.
From 0e8d2b5575938b8876a3c4bb66ee13c5d306fb6d Mon Sep 17 00:00:00 2001
From: Luiz Capitulino <address@hidden>
Date: Tue, 6 Apr 2010 18:55:54 -0300
Subject: [PATCH 5/9] Monitor: Return before exiting with 'quit'
The 'quit' Monitor command (implemented by do_quit()) calls
exit() directly, this is problematic under QMP because QEMU
exits before having a chance to send the ok response.
Clients don't know if QEMU exited because of a problem or
because the 'quit' command has been executed.
This commit fixes that by moving the exit() call to the main
loop, so that do_quit() requests the system to quit, instead
of calling exit() directly.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 3 ++-
sysemu.h | 2 ++
vl.c | 18 ++++++++++++++++++
3 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/monitor.c b/monitor.c
index ef84298..0dc24a2 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1017,7 +1017,8 @@ static void do_info_cpu_stats(Monitor *mon)
*/
static int do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
- exit(0);
+ monitor_suspend(mon);
+ qemu_system_exit_request();
return 0;
}
diff --git a/sysemu.h b/sysemu.h
index d0effa0..fa921df 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -45,9 +45,11 @@ void cpu_disable_ticks(void);
void qemu_system_reset_request(void);
void qemu_system_shutdown_request(void);
void qemu_system_powerdown_request(void);
+void qemu_system_exit_request(void);
int qemu_shutdown_requested(void);
int qemu_reset_requested(void);
int qemu_powerdown_requested(void);
+int qemu_exit_requested(void);
extern qemu_irq qemu_system_powerdown;
void qemu_system_reset(void);
diff --git a/vl.c b/vl.c
index a5a0f41..9ef6f2c 100644
--- a/vl.c
+++ b/vl.c
@@ -1697,6 +1697,7 @@ static int shutdown_requested;
static int powerdown_requested;
int debug_requested;
int vmstop_requested;
+static int exit_requested;
int qemu_shutdown_requested(void)
{
@@ -1719,6 +1720,12 @@ int qemu_powerdown_requested(void)
return r;
}
+int qemu_exit_requested(void)
+{
+ /* just return it, we'll exit() anyway */
+ return exit_requested;
+}
+
static int qemu_debug_requested(void)
{
int r = debug_requested;
@@ -1789,6 +1796,12 @@ void qemu_system_powerdown_request(void)
qemu_notify_event();
}
+void qemu_system_exit_request(void)
+{
+ exit_requested = 1;
+ qemu_notify_event();
+}
+
#ifdef _WIN32
static void host_main_loop_wait(int *timeout)
{
@@ -1925,6 +1938,8 @@ static int vm_can_run(void)
return 0;
if (debug_requested)
return 0;
+ if (exit_requested)
+ return 0;
return 1;
}
@@ -1977,6 +1992,9 @@ static void main_loop(void)
if ((r = qemu_vmstop_requested())) {
vm_stop(r);
}
+ if (qemu_exit_requested()) {
+ exit(0);
+ }
}
pause_all_vcpus();
}
--
1.7.1.rc1.12.ga6018
- [Qemu-devel] [PATCH 3/9] QError: Improve QERR_QMP_BAD_INPUT_OBJECT desc, (continued)
- [Qemu-devel] [PATCH 3/9] QError: Improve QERR_QMP_BAD_INPUT_OBJECT desc, Luiz Capitulino, 2010/04/26
- [Qemu-devel] [PATCH 4/9] QMP: Check "arguments" member's type, Luiz Capitulino, 2010/04/26
- [Qemu-devel] [PATCH 5/9] Monitor: Return before exiting with 'quit', Luiz Capitulino, 2010/04/26
- Re: [Qemu-devel] [PATCH 5/9] Monitor: Return before exiting with 'quit', Anthony Liguori, 2010/04/26
- Re: [Qemu-devel] [PATCH 5/9] Monitor: Return before exiting with 'quit', Luiz Capitulino, 2010/04/26
- Re: [Qemu-devel] [PATCH 5/9] Monitor: Return before exiting with 'quit', Anthony Liguori, 2010/04/26
- Re: [Qemu-devel] [PATCH 5/9] Monitor: Return before exiting with 'quit', Luiz Capitulino, 2010/04/26
- Re: [Qemu-devel] [PATCH 5/9] Monitor: Return before exiting with 'quit', Anthony Liguori, 2010/04/26
- [Qemu-devel] Re: [PATCH 5/9] Monitor: Return before exiting with 'quit', Jan Kiszka, 2010/04/26
- [Qemu-devel] Re: [PATCH 5/9] Monitor: Return before exiting with 'quit', Anthony Liguori, 2010/04/26
- [Qemu-devel] Re: [PATCH 5/9] Monitor: Return before exiting with 'quit',
Luiz Capitulino <=
- [Qemu-devel] Re: [PATCH 5/9] Monitor: Return before exiting with 'quit', Paolo Bonzini, 2010/04/27
- [Qemu-devel] Re: [PATCH 5/9] Monitor: Return before exiting with 'quit', Luiz Capitulino, 2010/04/27
- [Qemu-devel] Re: [PATCH 5/9] Monitor: Return before exiting with 'quit', Paolo Bonzini, 2010/04/27
[Qemu-devel] [PATCH 6/9] monitor: Cleanup ID assignment for compat switch, Luiz Capitulino, 2010/04/26
[Qemu-devel] [PATCH 7/9] monitor: Reorder intialization to drop initial mux focus, Luiz Capitulino, 2010/04/26
[Qemu-devel] [PATCH 8/9] chardev: Document mux option, Luiz Capitulino, 2010/04/26
[Qemu-devel] [PATCH 9/9] stash away SCM_RIGHTS fd until a getfd command arrives, Luiz Capitulino, 2010/04/26
Re: [Qemu-devel] [PATCH 0/9][PULL]: QMP/Monitor queue, Anthony Liguori, 2010/04/26