summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-01-18 12:36:25 +0200
committerAvi Kivity <avi@redhat.com>2009-01-18 12:36:25 +0200
commit931c5ab4bfd044e8dfc264ad4fda6ac62e078316 (patch)
treee75853dd4bfa7f1fee2fb1ddbce0510178b0f2a6 /gdbstub.c
parentDevice-assignment: fix ROM writing (diff)
parentRemove unused info_str parameter to pcnet_common_init() (diff)
downloadqemu-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.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gdbstub.c b/gdbstub.c
index 470138265..ce3ea490b 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -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