aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-28 19:25:15 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-09-04 09:37:26 -0500
commit67b3b71d51844b9413278add178a49723a97aad9 (patch)
treec19319fbda8fe31fd5189ea972f1179fc4eadad9
parentb84a5c6fa7f7211da9f81b2a73d2e340b5eca40d (diff)
Delay sighandler_setup()
If we are using --serial telnet:0:5555,server or similar, ^C will not kill qemu. We need to first connect using telnet, and the the ^C takes effect. Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--vl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/vl.c b/vl.c
index a89428573b..4f75d9b564 100644
--- a/vl.c
+++ b/vl.c
@@ -5808,11 +5808,6 @@ int main(int argc, char **argv, char **envp)
register_savevm("timer", 0, 2, timer_save, timer_load, NULL);
register_savevm_live("ram", 0, 3, ram_save_live, NULL, ram_load, NULL);
-#ifndef _WIN32
- /* must be after terminal init, SDL library changes signal handlers */
- sighandler_setup();
-#endif
-
/* Maintain compatibility with multiple stdio monitors */
if (!strcmp(monitor_device,"stdio")) {
for (i = 0; i < MAX_SERIAL_PORTS; i++) {
@@ -5945,6 +5940,11 @@ int main(int argc, char **argv, char **envp)
kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
+#ifndef _WIN32
+ /* must be after terminal init, SDL library changes signal handlers */
+ sighandler_setup();
+#endif
+
for (env = first_cpu; env != NULL; env = env->next_cpu) {
for (i = 0; i < nb_numa_nodes; i++) {
if (node_cpumask[i] & (1 << env->cpu_index)) {