diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-01-18 12:36:25 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-01-18 12:36:25 +0200 |
| commit | 931c5ab4bfd044e8dfc264ad4fda6ac62e078316 (patch) | |
| tree | e75853dd4bfa7f1fee2fb1ddbce0510178b0f2a6 /gdbstub.c | |
| parent | Device-assignment: fix ROM writing (diff) | |
| parent | Remove unused info_str parameter to pcnet_common_init() (diff) | |
| download | qemu-kvm-931c5ab4bfd044e8dfc264ad4fda6ac62e078316.tar.gz qemu-kvm-931c5ab4bfd044e8dfc264ad4fda6ac62e078316.tar.bz2 qemu-kvm-931c5ab4bfd044e8dfc264ad4fda6ac62e078316.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/hw/cirrus_vga.c
qemu/hw/pc.c
qemu/hw/pcnet.c
qemu/hw/vga.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'gdbstub.c')
| -rw-r--r-- | gdbstub.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -88,7 +88,11 @@ static int gdb_signal_table[] = { -1, /* SIGLOST */ TARGET_SIGUSR1, TARGET_SIGUSR2, +#ifdef TARGET_SIGPWR TARGET_SIGPWR, +#else + -1, +#endif -1, /* SIGPOLL */ -1, -1, @@ -101,6 +105,7 @@ static int gdb_signal_table[] = { -1, -1, -1, +#ifdef __SIGRTMIN __SIGRTMIN + 1, __SIGRTMIN + 2, __SIGRTMIN + 3, @@ -207,6 +212,7 @@ static int gdb_signal_table[] = { -1, -1, -1 +#endif }; #else /* In system mode we only need SIGINT and SIGTRAP; other signals |