diff options
author | neel <neel@FreeBSD.org> | 2012-11-11 03:26:14 +0000 |
---|---|---|
committer | neel <neel@FreeBSD.org> | 2012-11-11 03:26:14 +0000 |
commit | bc4be3dff1bc1b0cdc3ea30df0fd3e83998cf9eb (patch) | |
tree | b6b271fb331d43e30e10d824f2042de2c063f2eb /usr.sbin/bhyveload | |
parent | 263c4acf84c3be71025f3484c0378a83cd668e15 (diff) | |
parent | de6ea8b20e870490db809a8d8a965bd784981d81 (diff) | |
download | FreeBSD-src-bc4be3dff1bc1b0cdc3ea30df0fd3e83998cf9eb.zip FreeBSD-src-bc4be3dff1bc1b0cdc3ea30df0fd3e83998cf9eb.tar.gz |
IFC @ r242684
Diffstat (limited to 'usr.sbin/bhyveload')
-rw-r--r-- | usr.sbin/bhyveload/bhyveload.c | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 3b7fad4..12f7c4b 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include <sys/ioctl.h> #include <sys/stat.h> +#include <sys/disk.h> #include <machine/specialreg.h> #include <machine/vmm.h> @@ -291,6 +292,31 @@ cb_diskread(void *arg, int unit, uint64_t from, void *to, size_t size, return (0); } +static int +cb_diskioctl(void *arg, int unit, u_long cmd, void *data) +{ + struct stat sb; + + if (unit != 0 || disk_fd == -1) + return (EBADF); + + switch (cmd) { + case DIOCGSECTORSIZE: + *(u_int *)data = 512; + break; + case DIOCGMEDIASIZE: + if (fstat(disk_fd, &sb) == 0) + *(off_t *)data = sb.st_size; + else + return (ENOTTY); + break; + default: + return (ENOTTY); + } + + return (0); +} + /* * Guest virtual machine i/o callbacks */ @@ -490,7 +516,7 @@ cb_getenv(void *arg, int num) return (NULL); } -static struct loader_callbacks_v1 cb = { +static struct loader_callbacks cb = { .getc = cb_getc, .putc = cb_putc, .poll = cb_poll, @@ -504,6 +530,7 @@ static struct loader_callbacks_v1 cb = { .stat = cb_stat, .diskread = cb_diskread, + .diskioctl = cb_diskioctl, .copyin = cb_copyin, .copyout = cb_copyout, @@ -534,7 +561,7 @@ int main(int argc, char** argv) { void *h; - void (*func)(struct loader_callbacks_v1 *, void *, int, int); + void (*func)(struct loader_callbacks *, void *, int, int); int opt, error; char *disk_image; |