svn commit: r355319 - in stable/12/sys: amd64/amd64 i386/i386

[Andriy Gapon]

Author: avg
Date: Tue Dec  3 07:19:28 2019
New Revision: 355319
URL: https://svnweb.freebsd.org/changeset/base/355319

Log:
  MFC r354638: teach db_nextframe/x86 about [X]xen_intr_upcall interrupt handler

Modified:
  stable/12/sys/amd64/amd64/db_trace.c
  stable/12/sys/i386/i386/db_trace.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/amd64/db_trace.c
==============================================================================
--- stable/12/sys/amd64/amd64/db_trace.c	Tue Dec  3 07:03:25 2019	(r355318)
+++ stable/12/sys/amd64/amd64/db_trace.c	Tue Dec  3 07:19:28 2019	(r355319)
@@ -203,6 +203,7 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip, s
 			frame_type = TRAP;
 		else if (strncmp(name, "Xatpic_intr", 11) == 0 ||
 		    strncmp(name, "Xapic_isr", 9) == 0 ||
+		    strcmp(name, "Xxen_intr_upcall") == 0 ||
 		    strcmp(name, "Xtimerint") == 0 ||
 		    strcmp(name, "Xipi_intr_bitmap_handler") == 0 ||
 		    strcmp(name, "Xcpustop") == 0 ||

Modified: stable/12/sys/i386/i386/db_trace.c
==============================================================================
--- stable/12/sys/i386/i386/db_trace.c	Tue Dec  3 07:03:25 2019	(r355318)
+++ stable/12/sys/i386/i386/db_trace.c	Tue Dec  3 07:19:28 2019	(r355319)
@@ -346,7 +346,8 @@ db_nextframe(struct i386_frame **fp, db_addr_t *ip, st
 			frame_type = SYSCALL;
 		else if (strcmp(name, "dblfault_handler") == 0)
 			frame_type = DOUBLE_FAULT;
-		else if (strcmp(name, "Xtimerint") == 0)
+		else if (strcmp(name, "Xtimerint") == 0 ||
+		    strcmp(name, "Xxen_intr_upcall") == 0)
 			frame_type = INTERRUPT;
 		else if (strcmp(name, "Xcpustop") == 0 ||
 		    strcmp(name, "Xrendezvous") == 0 ||