[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/22] Stop current VCPU on synchronous reset reques
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 02/22] Stop current VCPU on synchronous reset requests |
Date: |
Thu, 27 Jan 2011 14:09:46 +0100 |
If some I/O operation ends up calling qemu_system_reset_request in VCPU
context, we record this and inform the io-thread, but we do not
terminate the VCPU loop. This can lead to fairly unexpected behavior if
the triggering reset operation is supposed to work synchronously.
Fix this for TCG (when run in deterministic I/O mode) by setting the
VCPU on stop and issuing a cpu_exit. KVM requires some more work on its
VCPU loop.
[ ported from qemu-kvm ]
Signed-off-by: Jan Kiszka <address@hidden>
---
cpus.c | 13 +++++++++----
cpus.h | 1 +
vl.c | 1 +
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cpus.c b/cpus.c
index ab6e40e..ceb3a83 100644
--- a/cpus.c
+++ b/cpus.c
@@ -99,6 +99,14 @@ void cpu_synchronize_all_post_init(void)
}
}
+void cpu_stop_current(void)
+{
+ if (cpu_single_env) {
+ cpu_single_env->stopped = 1;
+ cpu_exit(cpu_single_env);
+ }
+}
+
int cpu_is_stopped(CPUState *env)
{
return !vm_running || env->stopped;
@@ -863,10 +871,7 @@ void vm_stop(int reason)
* FIXME: should not return to device code in case
* vm_stop() has been requested.
*/
- if (cpu_single_env) {
- cpu_exit(cpu_single_env);
- cpu_single_env->stop = 1;
- }
+ cpu_stop_current();
return;
}
do_vm_stop(reason);
diff --git a/cpus.h b/cpus.h
index bf4d9bb..4cadb64 100644
--- a/cpus.h
+++ b/cpus.h
@@ -6,6 +6,7 @@ int qemu_init_main_loop(void);
void qemu_main_loop_start(void);
void resume_all_vcpus(void);
void pause_all_vcpus(void);
+void cpu_stop_current(void);
/* vl.c */
extern int smp_cores;
diff --git a/vl.c b/vl.c
index 33f844f..db24a05 100644
--- a/vl.c
+++ b/vl.c
@@ -1278,6 +1278,7 @@ void qemu_system_reset_request(void)
} else {
reset_requested = 1;
}
+ cpu_stop_current();
qemu_notify_event();
}
--
1.7.1
- [Qemu-devel] Re: [PATCH 04/22] Leave inner main_loop faster on pending requests, (continued)
[Qemu-devel] [PATCH 11/22] kvm: Refactor qemu_kvm_eat_signals, Jan Kiszka, 2011/01/27
[Qemu-devel] [PATCH 19/22] kvm: Remove static return code of kvm_handle_io, Jan Kiszka, 2011/01/27
[Qemu-devel] [PATCH 05/22] kvm: Report proper error on GET_VCPU_MMAP_SIZE failures, Jan Kiszka, 2011/01/27
[Qemu-devel] [PATCH 06/22] kvm: Drop redundant kvm_enabled from kvm_cpu_thread_fn, Jan Kiszka, 2011/01/27
[Qemu-devel] [PATCH 13/22] Set up signalfd under !CONFIG_IOTHREAD, Jan Kiszka, 2011/01/27
[Qemu-devel] [PATCH 16/22] Introduce VCPU self-signaling service, Jan Kiszka, 2011/01/27
[Qemu-devel] [PATCH 02/22] Stop current VCPU on synchronous reset requests,
Jan Kiszka <=
[Qemu-devel] [PATCH 08/22] kvm: Provide sigbus services arch-independently, Jan Kiszka, 2011/01/27
[Qemu-devel] [PATCH 01/22] Prevent abortion on multiple VCPU kicks, Jan Kiszka, 2011/01/27
[Qemu-devel] [PATCH 09/22] Refactor signal setup functions in cpus.c, Jan Kiszka, 2011/01/27
[Qemu-devel] [PATCH 12/22] kvm: Call qemu_kvm_eat_signals also under !CONFIG_IOTHREAD, Jan Kiszka, 2011/01/27