ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vhost-user: cleanup struct size math 

We are using local msg structures everywhere, use them
for sizeof as well.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2015-10-22 22:31:28 +03:00
parent 496fedddce
commit 86abad0fed
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/virtio/vhost-user.c
View File

@ -201,7 +201,7 @@ static int vhost_user_set_log_base(struct vhost_dev *dev, uint64_t base,
.request = VHOST_USER_SET_LOG_BASE, .request = VHOST_USER_SET_LOG_BASE,
.flags = VHOST_USER_VERSION, .flags = VHOST_USER_VERSION,
.payload.u64 = base, .payload.u64 = base,
.size = sizeof(m.payload.u64), .size = sizeof(msg.payload.u64),
}; };
if (shmfd && log->fd != -1) { if (shmfd && log->fd != -1) {
@ -265,8 +265,8 @@ static int vhost_user_set_mem_table(struct vhost_dev *dev,
return -1; return -1;
} }
msg.size = sizeof(m.payload.memory.nregions); msg.size = sizeof(msg.payload.memory.nregions);
msg.size += sizeof(m.payload.memory.padding); msg.size += sizeof(msg.payload.memory.padding);
msg.size += fd_num * sizeof(VhostUserMemoryRegion); msg.size += fd_num * sizeof(VhostUserMemoryRegion);
vhost_user_write(dev, &msg, fds, fd_num); vhost_user_write(dev, &msg, fds, fd_num);
@ -361,7 +361,7 @@ static int vhost_user_get_vring_base(struct vhost_dev *dev,
return -1; return -1;
} }
if (msg.size != sizeof(m.payload.state)) { if (msg.size != sizeof(msg.payload.state)) {
error_report("Received bad msg size."); error_report("Received bad msg size.");
return -1; return -1;
} }
@ -381,7 +381,7 @@ static int vhost_set_vring_file(struct vhost_dev *dev,
.request = request, .request = request,
.flags = VHOST_USER_VERSION, .flags = VHOST_USER_VERSION,
.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK, .payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK,
.size = sizeof(m.payload.u64), .size = sizeof(msg.payload.u64),
}; };
if (ioeventfd_enabled() && file->fd > 0) { if (ioeventfd_enabled() && file->fd > 0) {
@ -413,7 +413,7 @@ static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64)
.request = request, .request = request,
.flags = VHOST_USER_VERSION, .flags = VHOST_USER_VERSION,
.payload.u64 = u64, .payload.u64 = u64,
.size = sizeof(m.payload.u64), .size = sizeof(msg.payload.u64),
}; };
vhost_user_write(dev, &msg, NULL, 0); vhost_user_write(dev, &msg, NULL, 0);
@ -456,7 +456,7 @@ static int vhost_user_get_u64(struct vhost_dev *dev, int request, uint64_t *u64)
return -1; return -1;
} }
if (msg.size != sizeof(m.payload.u64)) { if (msg.size != sizeof(msg.payload.u64)) {
error_report("Received bad msg size."); error_report("Received bad msg size.");
return -1; return -1;
} }
@ -592,7 +592,7 @@ static int vhost_user_migration_done(struct vhost_dev *dev, char* mac_addr)
msg.request = VHOST_USER_SEND_RARP; msg.request = VHOST_USER_SEND_RARP;
msg.flags = VHOST_USER_VERSION; msg.flags = VHOST_USER_VERSION;
memcpy((char *)&msg.payload.u64, mac_addr, 6); memcpy((char *)&msg.payload.u64, mac_addr, 6);
msg.size = sizeof(m.payload.u64); msg.size = sizeof(msg.payload.u64);
err = vhost_user_write(dev, &msg, NULL, 0); err = vhost_user_write(dev, &msg, NULL, 0);
return err; return err;