[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [patch 07/10] qemu: handle reset/poweroff/shutdown in iothr
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [patch 07/10] qemu: handle reset/poweroff/shutdown in iothread |
Date: |
Wed, 25 Mar 2009 19:47:21 -0300 |
User-agent: |
quilt/0.47-1 |
Its simpler to handle these events from only one context.
Signed-off-by: Marcelo Tosatti <address@hidden>
Index: trunk/vl.c
===================================================================
--- trunk.orig/vl.c
+++ trunk/vl.c
@@ -4030,25 +4030,6 @@ static void *cpu_main_loop(void *arg)
}
cur_cpu = env;
- if (shutdown_requested) {
- ret = EXCP_INTERRUPT;
- if (no_shutdown) {
- vm_stop(0);
- no_shutdown = 0;
- }
- else
- break;
- }
- if (reset_requested) {
- reset_requested = 0;
- qemu_system_reset();
- ret = EXCP_INTERRUPT;
- }
- if (powerdown_requested) {
- powerdown_requested = 0;
- qemu_system_powerdown();
- ret = EXCP_INTERRUPT;
- }
if (unlikely(ret == EXCP_DEBUG)) {
gdb_set_stop_cpu(cur_cpu);
vm_stop(EXCP_DEBUG);
@@ -4097,10 +4078,6 @@ static void *cpu_main_loop(void *arg)
}
} else {
env = env->next_cpu ?: first_cpu;
- if (shutdown_requested) {
- ret = EXCP_INTERRUPT;
- break;
- }
timeout = 5000;
}
#ifdef CONFIG_PROFILER
@@ -4151,8 +4128,18 @@ static void main_loop(void)
qemu_system_ready = 1;
qemu_cond_broadcast(&qemu_system_cond);
- while (1)
+ while (1) {
main_loop_wait(1000);
+ if (qemu_shutdown_requested()) {
+ if (no_shutdown)
+ no_shutdown = 0;
+ else
+ break;
+ } else if (qemu_powerdown_requested())
+ qemu_system_powerdown();
+ else if (qemu_reset_requested())
+ qemu_system_reset();
+ }
}
static void help(int exitcode)
- Re: [Qemu-devel] [patch 03/10] qemu: per-arch cpu_has_work, (continued)
[Qemu-devel] [patch 05/10] qemu: separate thread for io, Marcelo Tosatti, 2009/03/25
[Qemu-devel] [patch 07/10] qemu: handle reset/poweroff/shutdown in iothread,
Marcelo Tosatti <=
[Qemu-devel] [patch 08/10] qemu: pause and resume cpu threads, Marcelo Tosatti, 2009/03/25
[Qemu-devel] [patch 09/10] qemu: handle vmstop from cpu context, Marcelo Tosatti, 2009/03/25
[Qemu-devel] [patch 10/10] qemu: basic kvm iothread support, Marcelo Tosatti, 2009/03/25
Re: [Qemu-devel] [patch 00/10] iothread (candidate for inclusion), Blue Swirl, 2009/03/29