* inferior.c (remove_inferior_command): Don't remove an active inferior.

	* mi/mi-main.c (mi_cmd_remove_inferior): Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1f473ae11cf6e196c7b1dde8dcb8ff79a8078c40..bf9f525c636af976112cfa064f5b2aeaa726571a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-22  Marc Khouzam  <marc.khouzam@ericsson.com>
+
+       * inferior.c (remove_inferior_command): Don't remove an active inferior.
+       * mi/mi-main.c (mi_cmd_remove_inferior): Ditto.
+
 2010-12-21  Tom Tromey  <tromey@redhat.com>
 
        * thread.c (print_thread_info): Make a ui-out table in CLI mode.

diff --git a/gdb/inferior.c b/gdb/inferior.c
index cad7e55d3c9f1d002a37f47138ac40c04903aab9..3493c16037b85ff74ac5b16bae5bc937340d86b8 100644 (file)
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -754,6 +754,9 @@ remove_inferior_command (char *args, int from_tty)
 
   if (inf == current_inferior ())
     error (_("Can not remove current symbol inferior."));
+    
+  if (inf->pid != 0)
+    error (_("Can not remove an active inferior."));
 
   delete_inferior_1 (inf, 1);
 }

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index b03a8b952383cad3e4a23ff47c95987b5d8c43e6..6f66e89ecbc3b28b28ddcc87effb00ee6e2da1c8 100644 (file)
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -1772,6 +1772,9 @@ mi_cmd_remove_inferior (char *command, char **argv, int argc)
   if (!inf)
     error ("the specified thread group does not exist");
 
+  if (inf->pid != 0)
+    error ("can not remove an active inferior");
+
   if (inf == current_inferior ())
     {
       struct thread_info *tp = 0;