The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=efec757b20425ac68171acc7f9cec8be750db688

commit efec757b20425ac68171acc7f9cec8be750db688
Author:     Robert Crowston <crows...@protonmail.com>
AuthorDate: 2021-04-10 19:16:02 +0000
Commit:     Warner Losh <i...@freebsd.org>
CommitDate: 2021-06-13 22:41:45 +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
---
 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 90aefe45c856..55f851590128 100644
--- a/usr.sbin/bhyve/mem.c
+++ b/usr.sbin/bhyve/mem.c
@@ -109,9 +109,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);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to