[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/12] simplify main loop functions
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/12] simplify main loop functions |
Date: |
Tue, 27 Sep 2011 18:31:51 +0200 |
Provide a clean example of how to use the main loop in the tools.
Signed-off-by: Paolo Bonzini <address@hidden>
---
cpus.c | 5 ----
cpus.h | 1 -
vl.c | 80 +++++++++++++++++++++++++++++++++------------------------------
3 files changed, 42 insertions(+), 44 deletions(-)
diff --git a/cpus.c b/cpus.c
index 826c88b..d1e2817 100644
--- a/cpus.c
+++ b/cpus.c
@@ -628,11 +628,6 @@ void qemu_init_cpu_loop(void)
qemu_thread_get_self(&io_thread);
}
-void qemu_main_loop_start(void)
-{
- resume_all_vcpus();
-}
-
void run_on_cpu(CPUState *env, void (*func)(void *data), void *data)
{
struct qemu_work_item wi;
diff --git a/cpus.h b/cpus.h
index 7422584..3525375 100644
--- a/cpus.h
+++ b/cpus.h
@@ -3,7 +3,6 @@
/* cpus.c */
void qemu_init_cpu_loop(void);
-void qemu_main_loop_start(void);
void resume_all_vcpus(void);
void pause_all_vcpus(void);
void cpu_stop_current(void);
diff --git a/vl.c b/vl.c
index 530afeb..3efeb1a 100644
--- a/vl.c
+++ b/vl.c
@@ -1439,18 +1439,50 @@ void qemu_system_vmstop_request(RunState state)
qemu_irq qemu_system_powerdown;
+static bool main_loop_should_exit(void)
+{
+ int r;
+ if (qemu_debug_requested()) {
+ vm_stop(RSTATE_DEBUG);
+ }
+ if (qemu_shutdown_requested()) {
+ qemu_kill_report();
+ monitor_protocol_event(QEVENT_SHUTDOWN, NULL);
+ if (no_shutdown) {
+ vm_stop(RSTATE_SHUTDOWN);
+ } else {
+ return true;
+ }
+ }
+ if (qemu_reset_requested()) {
+ pause_all_vcpus();
+ cpu_synchronize_all_states();
+ qemu_system_reset(VMRESET_REPORT);
+ resume_all_vcpus();
+ if (runstate_check(RSTATE_PANICKED) ||
+ runstate_check(RSTATE_SHUTDOWN)) {
+ runstate_set(RSTATE_PAUSED);
+ }
+ }
+ if (qemu_powerdown_requested()) {
+ monitor_protocol_event(QEVENT_POWERDOWN, NULL);
+ qemu_irq_raise(qemu_system_powerdown);
+ }
+ r = qemu_vmstop_requested();
+ if (r) {
+ vm_stop(r);
+ }
+ return false;
+}
+
static void main_loop(void)
{
bool nonblocking;
- int last_io __attribute__ ((unused)) = 0;
+ int last_io = 0;
#ifdef CONFIG_PROFILER
int64_t ti;
#endif
- int r;
-
- qemu_main_loop_start();
-
- for (;;) {
+ do {
nonblocking = !kvm_enabled() && last_io > 0;
#ifdef CONFIG_PROFILER
ti = profile_getclock();
@@ -1459,38 +1491,7 @@ static void main_loop(void)
#ifdef CONFIG_PROFILER
dev_time += profile_getclock() - ti;
#endif
-
- if (qemu_debug_requested()) {
- vm_stop(RSTATE_DEBUG);
- }
- if (qemu_shutdown_requested()) {
- qemu_kill_report();
- monitor_protocol_event(QEVENT_SHUTDOWN, NULL);
- if (no_shutdown) {
- vm_stop(RSTATE_SHUTDOWN);
- } else
- break;
- }
- if (qemu_reset_requested()) {
- pause_all_vcpus();
- cpu_synchronize_all_states();
- qemu_system_reset(VMRESET_REPORT);
- resume_all_vcpus();
- if (runstate_check(RSTATE_PANICKED) ||
- runstate_check(RSTATE_SHUTDOWN)) {
- runstate_set(RSTATE_PAUSED);
- }
- }
- if (qemu_powerdown_requested()) {
- monitor_protocol_event(QEVENT_POWERDOWN, NULL);
- qemu_irq_raise(qemu_system_powerdown);
- }
- if ((r = qemu_vmstop_requested())) {
- vm_stop(r);
- }
- }
- bdrv_close_all();
- pause_all_vcpus();
+ } while (!main_loop_should_exit());
}
static void version(void)
@@ -3452,7 +3453,10 @@ int main(int argc, char **argv, char **envp)
os_setup_post();
+ resume_all_vcpus();
main_loop();
+ bdrv_close_all();
+ pause_all_vcpus();
net_cleanup();
res_free();
--
1.7.6
- [Qemu-devel] [PATCH 01/12] qemu-timer: remove active_timers array, (continued)
- [Qemu-devel] [PATCH 06/12] qemu-timer: use atexit for quit_timers, Paolo Bonzini, 2011/09/27
- [Qemu-devel] [PATCH 02/12] qemu-timer: move common code to qemu_rearm_alarm_timer, Paolo Bonzini, 2011/09/27
- [Qemu-devel] [PATCH 05/12] qemu-timer: do not refer to runstate_is_running(), Paolo Bonzini, 2011/09/27
- [Qemu-devel] [PATCH 04/12] qemu-timer: move icount to cpus.c, Paolo Bonzini, 2011/09/27
- [Qemu-devel] [PATCH 07/12] qemu-timer: move more stuff out of qemu-timer.c, Paolo Bonzini, 2011/09/27
- [Qemu-devel] [PATCH 12/12] simplify main loop functions,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/12] Revert to a hand-made select loop, Paolo Bonzini, 2011/09/27
- [Qemu-devel] [PATCH 10/12] create main-loop.c, Paolo Bonzini, 2011/09/27
- [Qemu-devel] [PATCH 08/12] qemu-timer: do not use RunState change handlers, Paolo Bonzini, 2011/09/27
- [Qemu-devel] [PATCH 09/12] create main-loop.h, Paolo Bonzini, 2011/09/27