david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Break up user and system cpu_interrupt implementations

Browse Source 
Both have only two lines in common, and we will convert the system
service into a callback which is of no use for user mode operation.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
CC: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2011-04-13 01:32:56 +02:00 committed by Marcelo Tosatti
parent 450fb75c47
commit 97ffbd8d9d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
exec.c
View File

@ -1629,6 +1629,7 @@ static void cpu_unlink_tb(CPUState *env)
spin_unlock(&interrupt_lock); spin_unlock(&interrupt_lock);
} }
#ifndef CONFIG_USER_ONLY
/* mask must never be zero, except for A20 change call */ /* mask must never be zero, except for A20 change call */
void cpu_interrupt(CPUState *env, int mask) void cpu_interrupt(CPUState *env, int mask)
{ {
@ -1637,7 +1638,6 @@ void cpu_interrupt(CPUState *env, int mask)
old_mask = env->interrupt_request; old_mask = env->interrupt_request;
env->interrupt_request |= mask; env->interrupt_request |= mask;
#ifndef CONFIG_USER_ONLY
/* /*
* If called from iothread context, wake the target cpu in * If called from iothread context, wake the target cpu in
* case its halted. * case its halted.
@ -1646,21 +1646,27 @@ void cpu_interrupt(CPUState *env, int mask)
qemu_cpu_kick(env); qemu_cpu_kick(env);
return; return;
} }
#endif
if (use_icount) { if (use_icount) {
env->icount_decr.u16.high = 0xffff; env->icount_decr.u16.high = 0xffff;
#ifndef CONFIG_USER_ONLY
if (!can_do_io(env) if (!can_do_io(env)
&& (mask & ~old_mask) != 0) { && (mask & ~old_mask) != 0) {
cpu_abort(env, "Raised interrupt while not in I/O function"); cpu_abort(env, "Raised interrupt while not in I/O function");
} }
#endif
} else { } else {
cpu_unlink_tb(env); cpu_unlink_tb(env);
} }
} }
#else /* CONFIG_USER_ONLY */
void cpu_interrupt(CPUState *env, int mask)
{
env->interrupt_request |= mask;
cpu_unlink_tb(env);
}
#endif /* CONFIG_USER_ONLY */
void cpu_reset_interrupt(CPUState *env, int mask) void cpu_reset_interrupt(CPUState *env, int mask)
{ {
env->interrupt_request &= ~mask; env->interrupt_request &= ~mask;