SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-09-07 01:24:24 +00:00
parent 0c904fa153
commit cac1167ac2
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
64 changed files with 491 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

13
usr.sbin/vmd/vioscsi.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: vioscsi.c,v 1.23 2023/04/01 06:39:03 jsg Exp $ */
/* $OpenBSD: vioscsi.c,v 1.24 2023/09/06 19:26:39 dv Exp $ */
/*
* Copyright (c) 2017 Carlos Cardenas <ccardenas@openbsd.org>
@ -206,7 +206,6 @@ vioscsi_start_read(struct vioscsi_dev *dev, off_t block, size_t n_blocks)
goto nomem;
info->len = n_blocks * VIOSCSI_BLOCK_SIZE_CDROM;
info->offset = block * VIOSCSI_BLOCK_SIZE_CDROM;
info->file = &dev->file;
return info;
@ -217,13 +216,11 @@ nomem:
}
static const uint8_t *
vioscsi_finish_read(struct ioinfo *info)
vioscsi_finish_read(struct vioscsi_dev *dev, struct ioinfo *info)
{
struct virtio_backing *f;
struct virtio_backing *f = &dev->file;
f = info->file;
if (f->pread(f->p, info->buf, info->len, info->offset) != info->len) {
info->error = errno;
log_warn("vioscsi read error");
return NULL;
}
@ -928,7 +925,7 @@ vioscsi_handle_read_6(struct vioscsi_dev *dev,
}
/* read block */
read_buf = vioscsi_finish_read(info);
read_buf = vioscsi_finish_read(dev, info);
if (read_buf == NULL) {
log_warnx("%s: error reading position %ud",
@ -1057,7 +1054,7 @@ vioscsi_handle_read_10(struct vioscsi_dev *dev,
}
/* read block */
read_buf = vioscsi_finish_read(info);
read_buf = vioscsi_finish_read(dev, info);
if (read_buf == NULL) {
log_warnx("%s: error reading position %ud", __func__, read_lba);