[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] kvm specific wait_io_event
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 5/8] kvm specific wait_io_event |
Date: |
Mon, 22 Feb 2010 18:26:47 -0300 |
In KVM mode the global mutex is released when vcpus are executing,
which means acquiring the fairness mutex is not required.
Also for KVM there is one thread per vcpu, so tcg_has_work is meaningless.
Add a new qemu_wait_io_event_common function to hold common code
between TCG/KVM.
Signed-off-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
vl.c | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/vl.c b/vl.c
index 3bc618d..af198c1 100644
--- a/vl.c
+++ b/vl.c
@@ -3383,6 +3383,7 @@ static QemuCond qemu_pause_cond;
static void block_io_signals(void);
static void unblock_io_signals(void);
static int tcg_has_work(void);
+static int cpu_has_work(CPUState *env);
static int qemu_init_main_loop(void)
{
@@ -3403,6 +3404,15 @@ static int qemu_init_main_loop(void)
return 0;
}
+static void qemu_wait_io_event_common(CPUState *env)
+{
+ if (env->stop) {
+ env->stop = 0;
+ env->stopped = 1;
+ qemu_cond_signal(&qemu_pause_cond);
+ }
+}
+
static void qemu_wait_io_event(CPUState *env)
{
while (!tcg_has_work())
@@ -3419,11 +3429,15 @@ static void qemu_wait_io_event(CPUState *env)
qemu_mutex_unlock(&qemu_fair_mutex);
qemu_mutex_lock(&qemu_global_mutex);
- if (env->stop) {
- env->stop = 0;
- env->stopped = 1;
- qemu_cond_signal(&qemu_pause_cond);
- }
+ qemu_wait_io_event_common(env);
+}
+
+static void qemu_kvm_wait_io_event(CPUState *env)
+{
+ while (!cpu_has_work(env))
+ qemu_cond_timedwait(env->halt_cond, &qemu_global_mutex, 1000);
+
+ qemu_wait_io_event_common(env);
}
static int qemu_cpu_exec(CPUState *env);
@@ -3449,7 +3463,7 @@ static void *kvm_cpu_thread_fn(void *arg)
while (1) {
if (cpu_can_run(env))
qemu_cpu_exec(env);
- qemu_wait_io_event(env);
+ qemu_kvm_wait_io_event(env);
}
return NULL;
--
1.6.6
- [Qemu-devel] [PATCH 0/8] [GIT PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2010/02/22
- [Qemu-devel] [PATCH 5/8] kvm specific wait_io_event,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 8/8] kvm-all.c: define smp_wmb and use it for coalesced mmio, Marcelo Tosatti, 2010/02/22
- [Qemu-devel] [PATCH 3/8] kvm: Kill CR3_CACHE feature references, Marcelo Tosatti, 2010/02/22
- [Qemu-devel] [PATCH 6/8] kvm: consume internal signal with sigtimedwait, Marcelo Tosatti, 2010/02/22
- [Qemu-devel] [PATCH 7/8] kvm: remove pre-entry exit_request check with iothread enabled, Marcelo Tosatti, 2010/02/22
- [Qemu-devel] [PATCH 4/8] block SIGCHLD in vcpu thread(s), Marcelo Tosatti, 2010/02/22
- [Qemu-devel] [PATCH 1/8] use eventfd for iothread, Marcelo Tosatti, 2010/02/22
- [Qemu-devel] [PATCH 2/8] kvm: Fix eflags corruption in kvm mode, Marcelo Tosatti, 2010/02/22
- [Qemu-devel] Re: [PATCH 0/8] [GIT PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2010/02/22