d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bhyve: Drop volatile qualifiers from snapshot code

Browse Source 
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
This commit is contained in:
Mark Johnston 2022-11-11 10:02:26 -05:00
parent 593200c23b
commit 8b1adff8bc
3 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/amd64/include/vmm_snapshot.h
View File

@ -101,13 +101,13 @@ struct vm_snapshot_meta {
}; };
void vm_snapshot_buf_err(const char *bufname, const enum vm_snapshot_op op); void vm_snapshot_buf_err(const char *bufname, const enum vm_snapshot_op op);
int vm_snapshot_buf(volatile void *data, size_t data_size, int vm_snapshot_buf(void *data, size_t data_size,
struct vm_snapshot_meta *meta); struct vm_snapshot_meta *meta);
size_t vm_get_snapshot_size(struct vm_snapshot_meta *meta); size_t vm_get_snapshot_size(struct vm_snapshot_meta *meta);
int vm_snapshot_guest2host_addr(void **addrp, size_t len, bool restore_null, int vm_snapshot_guest2host_addr(void **addrp, size_t len, bool restore_null,
struct vm_snapshot_meta *meta); struct vm_snapshot_meta *meta);
int vm_snapshot_buf_cmp(volatile void *data, size_t data_size, int vm_snapshot_buf_cmp(void *data, size_t data_size,
struct vm_snapshot_meta *meta); struct vm_snapshot_meta *meta);
#define SNAPSHOT_BUF_OR_LEAVE(DATA, LEN, META, RES, LABEL) \ #define SNAPSHOT_BUF_OR_LEAVE(DATA, LEN, META, RES, LABEL) \
do { \ do { \

17
sys/amd64/vmm/vmm_snapshot.c
View File

@ -57,14 +57,11 @@ vm_snapshot_buf_err(const char *bufname, const enum vm_snapshot_op op)
} }
int int
vm_snapshot_buf(volatile void *data, size_t data_size, vm_snapshot_buf(void *data, size_t data_size, struct vm_snapshot_meta *meta)
struct vm_snapshot_meta *meta)
{ {
struct vm_snapshot_buffer *buffer; struct vm_snapshot_buffer *buffer;
int op; int op;
void *nv_data;
nv_data = __DEVOLATILE(void *, data);
buffer = &meta->buffer; buffer = &meta->buffer;
op = meta->op; op = meta->op;
@ -74,9 +71,9 @@ vm_snapshot_buf(volatile void *data, size_t data_size,
} }
if (op == VM_SNAPSHOT_SAVE) if (op == VM_SNAPSHOT_SAVE)
copyout(nv_data, buffer->buf, data_size); copyout(data, buffer->buf, data_size);
else if (op == VM_SNAPSHOT_RESTORE) else if (op == VM_SNAPSHOT_RESTORE)
copyin(buffer->buf, nv_data, data_size); copyin(buffer->buf, data, data_size);
else else
return (EINVAL); return (EINVAL);
@ -106,13 +103,11 @@ vm_get_snapshot_size(struct vm_snapshot_meta *meta)
} }
int int
vm_snapshot_buf_cmp(volatile void *data, size_t data_size, vm_snapshot_buf_cmp(void *data, size_t data_size, struct vm_snapshot_meta *meta)
struct vm_snapshot_meta *meta)
{ {
struct vm_snapshot_buffer *buffer; struct vm_snapshot_buffer *buffer;
int op; int op;
int ret; int ret;
void *_data = *(void **)(void *)&data;
buffer = &meta->buffer; buffer = &meta->buffer;
op = meta->op; op = meta->op;
@ -125,9 +120,9 @@ vm_snapshot_buf_cmp(volatile void *data, size_t data_size,
if (op == VM_SNAPSHOT_SAVE) { if (op == VM_SNAPSHOT_SAVE) {
ret = 0; ret = 0;
copyout(_data, buffer->buf, data_size); copyout(data, buffer->buf, data_size);
} else if (op == VM_SNAPSHOT_RESTORE) { } else if (op == VM_SNAPSHOT_RESTORE) {
ret = memcmp(_data, buffer->buf, data_size); ret = memcmp(data, buffer->buf, data_size);
} else { } else {
ret = EINVAL; ret = EINVAL;
goto done; goto done;

14
usr.sbin/bhyve/snapshot.c
View File

@ -1584,8 +1584,7 @@ vm_snapshot_buf_err(const char *bufname, const enum vm_snapshot_op op)
} }
int int
vm_snapshot_buf(volatile void *data, size_t data_size, vm_snapshot_buf(void *data, size_t data_size, struct vm_snapshot_meta *meta)
struct vm_snapshot_meta *meta)
{ {
struct vm_snapshot_buffer *buffer; struct vm_snapshot_buffer *buffer;
int op; int op;
@ -1599,9 +1598,9 @@ vm_snapshot_buf(volatile void *data, size_t data_size,
} }
if (op == VM_SNAPSHOT_SAVE) 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) else if (op == VM_SNAPSHOT_RESTORE)
memcpy((uint8_t *) data, buffer->buf, data_size); memcpy(data, buffer->buf, data_size);
else else
return (EINVAL); return (EINVAL);
@ -1667,8 +1666,7 @@ vm_snapshot_guest2host_addr(void **addrp, size_t len, bool restore_null,
} }
int int
vm_snapshot_buf_cmp(volatile void *data, size_t data_size, vm_snapshot_buf_cmp(void *data, size_t data_size, struct vm_snapshot_meta *meta)
struct vm_snapshot_meta *meta)
{ {
struct vm_snapshot_buffer *buffer; struct vm_snapshot_buffer *buffer;
int op; int op;
@ -1685,9 +1683,9 @@ vm_snapshot_buf_cmp(volatile void *data, size_t data_size,
if (op == VM_SNAPSHOT_SAVE) { if (op == VM_SNAPSHOT_SAVE) {
ret = 0; ret = 0;
memcpy(buffer->buf, (uint8_t *) data, data_size); memcpy(buffer->buf, data, data_size);
} else if (op == VM_SNAPSHOT_RESTORE) { } else if (op == VM_SNAPSHOT_RESTORE) {
ret = memcmp((uint8_t *) data, buffer->buf, data_size); ret = memcmp(data, buffer->buf, data_size);
} else { } else {
ret = EINVAL; ret = EINVAL;
goto done; goto done;