From 5f23eb4d9c9a09e8b2a315903cfa54959e85f9e2 Mon Sep 17 00:00:00 2001 From: Sean Bruno Date: Thu, 11 Sep 2014 22:39:27 +0000 Subject: [PATCH] Add device name used in geom_map verbose output. This helps when using geom_map with multiple flash/spi devices. Phabric: https://reviews.freebsd.org/D766 Reviewed by: adrian MFC after: 2 weeks --- sys/geom/geom_map.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/geom/geom_map.c b/sys/geom/geom_map.c index afc26b66633c..a5db2a55b3df 100644 --- a/sys/geom/geom_map.c +++ b/sys/geom/geom_map.c @@ -153,8 +153,8 @@ find_marker(struct g_consumer *cp, const char *line, off_t *offset) return (1); if (bootverbose) { - printf("MAP: search key \"%s\" from 0x%jx, step 0x%jx\n", - search_key, (intmax_t)search_start, (intmax_t)search_step); + printf("MAP: search %s for key \"%s\" from 0x%jx, step 0x%jx\n", + cp->geom->name, search_key, (intmax_t)search_start, (intmax_t)search_step); } /* error if search_key is empty */ @@ -321,9 +321,9 @@ g_map_parse_part(struct g_class *mp, struct g_provider *pp, } if (bootverbose) { - printf("MAP: %jxx%jx, data=%jxx%jx " + printf("MAP: %s: %jxx%jx, data=%jxx%jx " "\"/dev/map/%s\"\n", - (intmax_t)start, (intmax_t)size, (intmax_t)offset, + cp->geom->name, (intmax_t)start, (intmax_t)size, (intmax_t)offset, (intmax_t)dsize, name); }