mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 23:13:30 +00:00
Rework vm_state_change notifiers (Jan Kiszka)
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6402 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
5c047c0d3f
commit
9781e0401a
|
@ -1622,7 +1622,8 @@ static int audio_driver_init (AudioState *s, struct audio_driver *drv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void audio_vm_change_state_handler (void *opaque, int running)
|
static void audio_vm_change_state_handler (void *opaque, int running,
|
||||||
|
int reason)
|
||||||
{
|
{
|
||||||
AudioState *s = opaque;
|
AudioState *s = opaque;
|
||||||
HWVoiceOut *hwo = NULL;
|
HWVoiceOut *hwo = NULL;
|
||||||
|
|
11
gdbstub.c
11
gdbstub.c
|
@ -1867,7 +1867,7 @@ void gdb_set_stop_cpu(CPUState *env)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
static void gdb_vm_stopped(void *opaque, int reason)
|
static void gdb_vm_state_change(void *opaque, int running, int reason)
|
||||||
{
|
{
|
||||||
GDBState *s = gdbserver_state;
|
GDBState *s = gdbserver_state;
|
||||||
CPUState *env = s->c_cpu;
|
CPUState *env = s->c_cpu;
|
||||||
|
@ -1875,7 +1875,8 @@ static void gdb_vm_stopped(void *opaque, int reason)
|
||||||
const char *type;
|
const char *type;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (s->state == RS_SYSCALL)
|
if (running || (reason != EXCP_DEBUG && reason != EXCP_INTERRUPT) ||
|
||||||
|
s->state == RS_SYSCALL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* disable single step if it was enable */
|
/* disable single step if it was enable */
|
||||||
|
@ -1904,10 +1905,8 @@ static void gdb_vm_stopped(void *opaque, int reason)
|
||||||
}
|
}
|
||||||
tb_flush(env);
|
tb_flush(env);
|
||||||
ret = GDB_SIGNAL_TRAP;
|
ret = GDB_SIGNAL_TRAP;
|
||||||
} else if (reason == EXCP_INTERRUPT) {
|
|
||||||
ret = GDB_SIGNAL_INT;
|
|
||||||
} else {
|
} else {
|
||||||
ret = 0;
|
ret = GDB_SIGNAL_INT;
|
||||||
}
|
}
|
||||||
snprintf(buf, sizeof(buf), "T%02xthread:%02x;", ret, env->cpu_index+1);
|
snprintf(buf, sizeof(buf), "T%02xthread:%02x;", ret, env->cpu_index+1);
|
||||||
put_packet(s, buf);
|
put_packet(s, buf);
|
||||||
|
@ -2300,7 +2299,7 @@ int gdbserver_start(const char *port)
|
||||||
gdbserver_state = s;
|
gdbserver_state = s;
|
||||||
qemu_chr_add_handlers(chr, gdb_chr_can_receive, gdb_chr_receive,
|
qemu_chr_add_handlers(chr, gdb_chr_can_receive, gdb_chr_receive,
|
||||||
gdb_chr_event, NULL);
|
gdb_chr_event, NULL);
|
||||||
qemu_add_vm_stop_handler(gdb_vm_stopped, NULL);
|
qemu_add_vm_change_state_handler(gdb_vm_state_change, NULL);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
6
sysemu.h
6
sysemu.h
|
@ -12,16 +12,12 @@ extern uint8_t qemu_uuid[];
|
||||||
#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
|
#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
|
||||||
|
|
||||||
typedef struct vm_change_state_entry VMChangeStateEntry;
|
typedef struct vm_change_state_entry VMChangeStateEntry;
|
||||||
typedef void VMChangeStateHandler(void *opaque, int running);
|
typedef void VMChangeStateHandler(void *opaque, int running, int reason);
|
||||||
typedef void VMStopHandler(void *opaque, int reason);
|
|
||||||
|
|
||||||
VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
|
VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
|
||||||
void *opaque);
|
void *opaque);
|
||||||
void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
|
void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
|
||||||
|
|
||||||
int qemu_add_vm_stop_handler(VMStopHandler *cb, void *opaque);
|
|
||||||
void qemu_del_vm_stop_handler(VMStopHandler *cb, void *opaque);
|
|
||||||
|
|
||||||
void vm_start(void);
|
void vm_start(void);
|
||||||
void vm_stop(int reason);
|
void vm_stop(int reason);
|
||||||
|
|
||||||
|
|
29
vl.c
29
vl.c
|
@ -3451,37 +3451,21 @@ void qemu_del_vm_change_state_handler(VMChangeStateEntry *e)
|
||||||
qemu_free (e);
|
qemu_free (e);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void vm_state_notify(int running)
|
static void vm_state_notify(int running, int reason)
|
||||||
{
|
{
|
||||||
VMChangeStateEntry *e;
|
VMChangeStateEntry *e;
|
||||||
|
|
||||||
for (e = vm_change_state_head.lh_first; e; e = e->entries.le_next) {
|
for (e = vm_change_state_head.lh_first; e; e = e->entries.le_next) {
|
||||||
e->cb(e->opaque, running);
|
e->cb(e->opaque, running, reason);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXX: support several handlers */
|
|
||||||
static VMStopHandler *vm_stop_cb;
|
|
||||||
static void *vm_stop_opaque;
|
|
||||||
|
|
||||||
int qemu_add_vm_stop_handler(VMStopHandler *cb, void *opaque)
|
|
||||||
{
|
|
||||||
vm_stop_cb = cb;
|
|
||||||
vm_stop_opaque = opaque;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void qemu_del_vm_stop_handler(VMStopHandler *cb, void *opaque)
|
|
||||||
{
|
|
||||||
vm_stop_cb = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void vm_start(void)
|
void vm_start(void)
|
||||||
{
|
{
|
||||||
if (!vm_running) {
|
if (!vm_running) {
|
||||||
cpu_enable_ticks();
|
cpu_enable_ticks();
|
||||||
vm_running = 1;
|
vm_running = 1;
|
||||||
vm_state_notify(1);
|
vm_state_notify(1, 0);
|
||||||
qemu_rearm_alarm_timer(alarm_timer);
|
qemu_rearm_alarm_timer(alarm_timer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3491,12 +3475,7 @@ void vm_stop(int reason)
|
||||||
if (vm_running) {
|
if (vm_running) {
|
||||||
cpu_disable_ticks();
|
cpu_disable_ticks();
|
||||||
vm_running = 0;
|
vm_running = 0;
|
||||||
if (reason != 0) {
|
vm_state_notify(0, reason);
|
||||||
if (vm_stop_cb) {
|
|
||||||
vm_stop_cb(vm_stop_opaque, reason);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
vm_state_notify(0);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue