aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/bhyve
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2022-11-11 15:02:26 +0000
committerMark Johnston <markj@FreeBSD.org>2022-11-11 15:02:26 +0000
commit8b1adff8bcbdf0e58878431c6ed5a14553178d4d (patch)
tree3a17e509e34eab35818dddc53184d94a109c21b6 /usr.sbin/bhyve
parent593200c23b57ea6977bf5084b91fc5c63dacbb80 (diff)
downloadsrc-8b1adff8bcbdf0e58878431c6ed5a14553178d4d.tar.gz
src-8b1adff8bcbdf0e58878431c6ed5a14553178d4d.zip
bhyve: Drop volatile qualifiers from snapshot code
They accomplish nothing since the qualifier is casted away in calls to memcpy() and copyin()/copyout(). No functional change intended. MFC after: 2 weeks Reviewed by: corvink, jhb Differential Revision: https://reviews.freebsd.org/D37292
Diffstat (limited to 'usr.sbin/bhyve')
-rw-r--r--usr.sbin/bhyve/snapshot.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c
index 0c7267316a17..6f4e3c1f91a2 100644
--- a/usr.sbin/bhyve/snapshot.c
+++ b/usr.sbin/bhyve/snapshot.c
@@ -1584,8 +1584,7 @@ vm_snapshot_buf_err(const char *bufname, const enum vm_snapshot_op op)
}
int
-vm_snapshot_buf(volatile void *data, size_t data_size,
- struct vm_snapshot_meta *meta)
+vm_snapshot_buf(void *data, size_t data_size, struct vm_snapshot_meta *meta)
{
struct vm_snapshot_buffer *buffer;
int op;
@@ -1599,9 +1598,9 @@ vm_snapshot_buf(volatile void *data, size_t data_size,
}
if (op == VM_SNAPSHOT_SAVE)
- memcpy(buffer->buf, (uint8_t *) data, data_size);
+ memcpy(buffer->buf, data, data_size);
else if (op == VM_SNAPSHOT_RESTORE)
- memcpy((uint8_t *) data, buffer->buf, data_size);
+ memcpy(data, buffer->buf, data_size);
else
return (EINVAL);
@@ -1667,8 +1666,7 @@ done:
}
int
-vm_snapshot_buf_cmp(volatile void *data, size_t data_size,
- struct vm_snapshot_meta *meta)
+vm_snapshot_buf_cmp(void *data, size_t data_size, struct vm_snapshot_meta *meta)
{
struct vm_snapshot_buffer *buffer;
int op;
@@ -1685,9 +1683,9 @@ vm_snapshot_buf_cmp(volatile void *data, size_t data_size,
if (op == VM_SNAPSHOT_SAVE) {
ret = 0;
- memcpy(buffer->buf, (uint8_t *) data, data_size);
+ memcpy(buffer->buf, data, data_size);
} else if (op == VM_SNAPSHOT_RESTORE) {
- ret = memcmp((uint8_t *) data, buffer->buf, data_size);
+ ret = memcmp(data, buffer->buf, data_size);
} else {
ret = EINVAL;
goto done;