From ae9ea22e14bf523aee508f1fe07091580b528a2e Mon Sep 17 00:00:00 2001 From: Robert Wing Date: Tue, 18 Jan 2022 11:26:49 -0900 Subject: [PATCH] bhyve: get mediasize for character devices when resizing virtio-blk Reviewed by: imp, allanjude, jhb Differential Revision: https://reviews.freebsd.org/D33403 --- usr.sbin/bhyve/block_if.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c index 4003bc438a5..217f7181de7 100644 --- a/usr.sbin/bhyve/block_if.c +++ b/usr.sbin/bhyve/block_if.c @@ -667,14 +667,24 @@ blockif_resized(int fd, enum ev_type type, void *arg) { struct blockif_ctxt *bc; struct stat sb; + off_t mediasize; if (fstat(fd, &sb) != 0) return; + if (S_ISCHR(sb.st_mode)) { + if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) < 0) { + EPRINTLN("blockif_resized: get mediasize failed: %s", + strerror(errno)); + return; + } + } else + mediasize = sb.st_size; + bc = arg; pthread_mutex_lock(&bc->bc_mtx); - if (sb.st_size != bc->bc_size) { - bc->bc_size = sb.st_size; + if (mediasize != bc->bc_size) { + bc->bc_size = mediasize; bc->bc_resize_cb(bc, bc->bc_resize_cb_arg, bc->bc_size); } pthread_mutex_unlock(&bc->bc_mtx);