[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/13] simplify main loop functions
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 13/13] simplify main loop functions |
Date: |
Tue, 11 Oct 2011 13:35:30 +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 | 79 +++++++++++++++++++++++++++++++++------------------------------
3 files changed, 41 insertions(+), 44 deletions(-)
diff --git a/cpus.c b/cpus.c
index ead18af..b494e73 100644
--- a/cpus.c
+++ b/cpus.c
@@ -627,11 +627,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 3fa4b72..d7e1a7d 100644
--- a/vl.c
+++ b/vl.c
@@ -1430,18 +1430,49 @@ void qemu_system_vmstop_request(RunState state)
qemu_irq qemu_system_powerdown;
+static bool main_loop_should_exit(void)
+{
+ RunState r;
+ if (qemu_debug_requested()) {
+ vm_stop(RUN_STATE_DEBUG);
+ }
+ if (qemu_shutdown_requested()) {
+ qemu_kill_report();
+ monitor_protocol_event(QEVENT_SHUTDOWN, NULL);
+ if (no_shutdown) {
+ vm_stop(RUN_STATE_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(RUN_STATE_INTERNAL_ERROR) ||
+ runstate_check(RUN_STATE_SHUTDOWN)) {
+ runstate_set(RUN_STATE_PAUSED);
+ }
+ }
+ if (qemu_powerdown_requested()) {
+ monitor_protocol_event(QEVENT_POWERDOWN, NULL);
+ qemu_irq_raise(qemu_system_powerdown);
+ }
+ if (qemu_vmstop_requested(&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
- RunState r;
-
- qemu_main_loop_start();
-
- for (;;) {
+ do {
nonblocking = !kvm_enabled() && last_io > 0;
#ifdef CONFIG_PROFILER
ti = profile_getclock();
@@ -1450,38 +1481,7 @@ static void main_loop(void)
#ifdef CONFIG_PROFILER
dev_time += profile_getclock() - ti;
#endif
-
- if (qemu_debug_requested()) {
- vm_stop(RUN_STATE_DEBUG);
- }
- if (qemu_shutdown_requested()) {
- qemu_kill_report();
- monitor_protocol_event(QEVENT_SHUTDOWN, NULL);
- if (no_shutdown) {
- vm_stop(RUN_STATE_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(RUN_STATE_INTERNAL_ERROR) ||
- runstate_check(RUN_STATE_SHUTDOWN)) {
- runstate_set(RUN_STATE_PAUSED);
- }
- }
- if (qemu_powerdown_requested()) {
- monitor_protocol_event(QEVENT_POWERDOWN, NULL);
- qemu_irq_raise(qemu_system_powerdown);
- }
- if (qemu_vmstop_requested(&r)) {
- vm_stop(r);
- }
- }
- bdrv_close_all();
- pause_all_vcpus();
+ } while (!main_loop_should_exit());
}
static void version(void)
@@ -3441,7 +3441,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
- Re: [Qemu-devel] [PATCH 02/13] qemu-timer: remove active_timers array, (continued)
- [Qemu-devel] [PATCH 09/13] qemu-timer: do not use RunState change handlers, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 04/13] qemu-timer: more clock functions, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 12/13] Revert to a hand-made select loop, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 08/13] qemu-timer: move more stuff out of qemu-timer.c, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 07/13] qemu-timer: use atexit for quit_timers, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 05/13] qemu-timer: move icount to cpus.c, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 03/13] qemu-timer: move common code to qemu_rearm_alarm_timer, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 13/13] simplify main loop functions,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/13] create main-loop.c, Paolo Bonzini, 2011/10/11
- [Qemu-devel] [PATCH 10/13] create main-loop.h, Paolo Bonzini, 2011/10/11
- Re: [Qemu-devel] [PATCH v2 00/13] allow tools to use the QEMU main loop, Anthony Liguori, 2011/10/17