The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7e8e5b8b80ae0d23ebd63ac9162396617d434c3b
commit 7e8e5b8b80ae0d23ebd63ac9162396617d434c3b Author: Robert Crowston <[email protected]> AuthorDate: 2021-04-10 19:16:02 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2023-01-26 19:11:36 +0000 bhyve: enhance debug info for memory range clash Explain what the two clashing regions are. Reivewed by: grehan, jhb Differential Revision: https://reviews.freebsd.org/D29696 Pull Request: https://github.com/freebsd/freebsd-src/pull/463 (cherry picked from commit efec757b20425ac68171acc7f9cec8be750db688) --- usr.sbin/bhyve/mem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c index 7482174bfc32..0ea9c56192c6 100644 --- a/usr.sbin/bhyve/mem.c +++ b/usr.sbin/bhyve/mem.c @@ -110,9 +110,11 @@ mmio_rb_add(struct mmio_rb_tree *rbt, struct mmio_rb_range *new) if (overlap != NULL) { #ifdef RB_DEBUG - printf("overlap detected: new %lx:%lx, tree %lx:%lx\n", + printf("overlap detected: new %lx:%lx, tree %lx:%lx, '%s' " + "claims region already claimed for '%s'\n", new->mr_base, new->mr_end, - overlap->mr_base, overlap->mr_end); + overlap->mr_base, overlap->mr_end, + new->mr_param.name, overlap->mr_param.name); #endif return (EEXIST);
