From 4ec89149dd83efecea15300bf425c9988f4cd5c0 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Sun, 12 Jan 2020 00:40:02 +0000 Subject: [PATCH] Remove last traces of discard_all_inferiors The multi-target patch should have removed all traces of discard_all_inferiors, but somehow one use stayed behind along with the definition of the function. discard_all_inferiors is bad now because it blindly exits inferiors of all target connections. It's best to remove it. gdb/ChangeLog: 2020-01-12 Pedro Alves * bsd-kvm.c (bsd_kvm_target::close): Call exit_inferior_silent directly for the current inferior instead of discard_all_inferiors. (discard_all_inferiors): Delete. --- gdb/ChangeLog | 7 +++++++ gdb/bsd-kvm.c | 2 +- gdb/inferior.c | 7 ------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 735c46bf705..980114919df 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-01-12 Pedro Alves + + * bsd-kvm.c (bsd_kvm_target::close): Call exit_inferior_silent + directly for the current inferior instead of + discard_all_inferiors. + (discard_all_inferiors): Delete. + 2020-01-11 Tom Tromey * tui/tui-wingeneral.c (box_win): Check cli_styling. diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c index f864ba8b41c..b1b1fee5f4f 100644 --- a/gdb/bsd-kvm.c +++ b/gdb/bsd-kvm.c @@ -156,7 +156,7 @@ bsd_kvm_target::close () } inferior_ptid = null_ptid; - discard_all_inferiors (); + exit_inferior_silent (current_inferior ()); } static LONGEST diff --git a/gdb/inferior.c b/gdb/inferior.c index eb090dfde1a..c2e9da3d3d5 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -260,13 +260,6 @@ inferior_appeared (struct inferior *inf, int pid) gdb::observers::inferior_appeared.notify (inf); } -void -discard_all_inferiors (void) -{ - for (inferior *inf : all_non_exited_inferiors ()) - exit_inferior_silent (inf); -} - struct inferior * find_inferior_id (int num) { -- 2.30.2