diff options
| author |   krw <krw@openbsd.org> | 2020-12-10 16:58:03 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-12-10 16:58:03 +0000 |
| commit | e0a1820e611d099448b3ba9ec44a5fb92d7c30f6 (patch) | |
| tree | be4a7f06dfe4f1bc29faf2e7105f9cc993f3e533 | |
| parent | ieee80211_decrypt must use m_freem() instead of m_free() (diff) | |
| download | wireguard-openbsd-e0a1820e611d099448b3ba9ec44a5fb92d7c30f6.tar.xz wireguard-openbsd-e0a1820e611d099448b3ba9ec44a5fb92d7c30f6.zip | |
De-daddr32_t.
ok mlarkin@ tb@
| -rw-r--r-- | usr.sbin/vmd/vmboot.c | 14 | ||||
| -rw-r--r-- | usr.sbin/vmd/vmboot.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/vmd/vmboot.c b/usr.sbin/vmd/vmboot.c index d249e8701eb..349635fc33d 100644 --- a/usr.sbin/vmd/vmboot.c +++ b/usr.sbin/vmd/vmboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmboot.c,v 1.7 2018/11/26 10:39:30 reyk Exp $ */ +/* $OpenBSD: vmboot.c,v 1.8 2020/12/10 16:58:03 krw Exp $ */ /* * Copyright (c) 2016 Reyk Floeter <reyk@openbsd.org> @@ -42,7 +42,7 @@ int vmboot_bootcmd(char *, struct vmboot_params *); int vmboot_bootargs(int argc, char **argv, struct vmboot_params *); uint32_t vmboot_bootdevice(const char *); -int vmboot_strategy(void *, int, daddr32_t, size_t, void *, size_t *); +int vmboot_strategy(void *, int, daddr_t, size_t, void *, size_t *); off_t vmboot_findopenbsd(struct open_file *, off_t, struct disklabel *); void *vmboot_loadfile(struct open_file *, char *, size_t *); @@ -241,26 +241,26 @@ struct open_file vmboot_file = { int vmboot_strategy(void *devdata, int rw, - daddr32_t blk, size_t size, void *buf, size_t *rsize) + daddr_t blk, size_t size, void *buf, size_t *rsize) { struct vmboot_params *vmboot = devdata; struct virtio_backing *vfp = vmboot->vbp_arg; ssize_t rlen; + off_t off; if (vfp == NULL) return (EIO); + off = (blk + vmboot->vbp_partoff) * DEV_BSIZE; switch (rw) { case F_READ: - rlen = vfp->pread(vfp->p, buf, size, - (blk + vmboot->vbp_partoff) * DEV_BSIZE); + rlen = vfp->pread(vfp->p, buf, size, off); if (rlen == -1) return (errno); *rsize = (size_t)rlen; break; case F_WRITE: - rlen = vfp->pwrite(vfp->p, buf, size, - (blk + vmboot->vbp_partoff) * DEV_BSIZE); + rlen = vfp->pwrite(vfp->p, buf, size, off); if (rlen == -1) return (errno); *rsize = (size_t)rlen; diff --git a/usr.sbin/vmd/vmboot.h b/usr.sbin/vmd/vmboot.h index c81fa3cdc46..54c6f1e1b24 100644 --- a/usr.sbin/vmd/vmboot.h +++ b/usr.sbin/vmd/vmboot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmboot.h,v 1.2 2016/11/26 20:03:42 reyk Exp $ */ +/* $OpenBSD: vmboot.h,v 1.3 2020/12/10 16:58:03 krw Exp $ */ /* * Copyright (c) 2016 Reyk Floeter <reyk@openbsd.org> @@ -46,7 +46,7 @@ struct fs_ops { struct devsw { char *dv_name; - int (*dv_strategy)(void *, int, daddr32_t, size_t, + int (*dv_strategy)(void *, int, daddr_t, size_t, void *, size_t *); }; |