falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu: create helper for event notification (Marcelo Tosatti) 

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7236 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-04-24 18:03:11 +00:00
parent 96248fd890
commit d9f75a4eb4
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/mac_dbdma.c
View File

@ -651,9 +651,7 @@ void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq,
void DBDMA_schedule(void) void DBDMA_schedule(void)
{ {
CPUState *env = cpu_single_env; qemu_notify_event();
if (env)
cpu_exit(env);
} }
static void static void

3
qemu-common.h
View File

@ -186,6 +186,9 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id);
/* Force QEMU to stop what it's doing and service IO */ /* Force QEMU to stop what it's doing and service IO */
void qemu_service_io(void); void qemu_service_io(void);
/* Force QEMU to process pending events */
void qemu_notify_event(void);
typedef struct QEMUIOVector { typedef struct QEMUIOVector {
struct iovec *iov; struct iovec *iov;
int niov; int niov;

43
vl.c
View File

@ -1193,9 +1193,8 @@ void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time)
qemu_rearm_alarm_timer(alarm_timer); qemu_rearm_alarm_timer(alarm_timer);
} }
/* Interrupt execution to force deadline recalculation. */ /* Interrupt execution to force deadline recalculation. */
if (use_icount && cpu_single_env) { if (use_icount)
cpu_exit(cpu_single_env); qemu_notify_event();
}
} }
} }
@ -1370,6 +1369,7 @@ static void host_alarm_handler(int host_signum)
#endif #endif
} }
event_pending = 1; event_pending = 1;
qemu_notify_event();
} }
} }
@ -3406,15 +3406,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
void qemu_service_io(void) void qemu_service_io(void)
{ {
CPUState *env = cpu_single_env; qemu_notify_event();
if (env) {
cpu_exit(env);
#ifdef CONFIG_KQEMU
if (env->kqemu_enabled) {
kqemu_cpu_interrupt(env);
}
#endif
}
} }
/***********************************************************/ /***********************************************************/
@ -3482,15 +3474,12 @@ void qemu_bh_schedule_idle(QEMUBH *bh)
void qemu_bh_schedule(QEMUBH *bh) void qemu_bh_schedule(QEMUBH *bh)
{ {
CPUState *env = cpu_single_env;
if (bh->scheduled) if (bh->scheduled)
return; return;
bh->scheduled = 1; bh->scheduled = 1;
bh->idle = 0; bh->idle = 0;
/* stop the currently executing CPU to execute the BH ASAP */ /* stop the currently executing CPU to execute the BH ASAP */
if (env) { qemu_notify_event();
cpu_exit(env);
}
} }
void qemu_bh_cancel(QEMUBH *bh) void qemu_bh_cancel(QEMUBH *bh)
@ -3701,22 +3690,32 @@ void qemu_system_reset_request(void)
} else { } else {
reset_requested = 1; reset_requested = 1;
} }
if (cpu_single_env) qemu_notify_event();
cpu_exit(cpu_single_env);
} }
void qemu_system_shutdown_request(void) void qemu_system_shutdown_request(void)
{ {
shutdown_requested = 1; shutdown_requested = 1;
if (cpu_single_env) qemu_notify_event();
cpu_exit(cpu_single_env);
} }
void qemu_system_powerdown_request(void) void qemu_system_powerdown_request(void)
{ {
powerdown_requested = 1; powerdown_requested = 1;
if (cpu_single_env) qemu_notify_event();
cpu_exit(cpu_single_env); }
void qemu_notify_event(void)
{
CPUState *env = cpu_single_env;
if (env) {
cpu_exit(env);
#ifdef USE_KQEMU
if (env->kqemu_enabled)
kqemu_cpu_interrupt(env);
#endif
}
} }
#ifdef _WIN32 #ifdef _WIN32