mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib/vhost-user-*: use QEMU bswap helper functions

Browse Source 
Let's replace the calls to le*toh() and htole*() with qemu/bswap.h
helpers to make the code more portable.

Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20240618100447.145697-1-sgarzare@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Stefano Garzarella 2024-06-18 12:04:47 +02:00 committed by Michael S. Tsirkin
parent 03582094da
commit 5ab04420c3
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/vhost-user-blk/vhost-user-blk.c
View File

@ -16,6 +16,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/bswap.h"
#include "standard-headers/linux/virtio_blk.h" #include "standard-headers/linux/virtio_blk.h"
#include "libvhost-user-glib.h" #include "libvhost-user-glib.h"
@ -194,8 +195,8 @@ vub_discard_write_zeroes(VubReq *req, struct iovec *iov, uint32_t iovcnt,
#if defined(__linux__) && defined(BLKDISCARD) && defined(BLKZEROOUT) #if defined(__linux__) && defined(BLKDISCARD) && defined(BLKZEROOUT)
VubDev *vdev_blk = req->vdev_blk; VubDev *vdev_blk = req->vdev_blk;
desc = buf; desc = buf;
uint64_t range[2] = { le64toh(desc->sector) << 9, uint64_t range[2] = { le64_to_cpu(desc->sector) << 9,
le32toh(desc->num_sectors) << 9 }; le32_to_cpu(desc->num_sectors) << 9 };
if (type == VIRTIO_BLK_T_DISCARD) { if (type == VIRTIO_BLK_T_DISCARD) {
if (ioctl(vdev_blk->blk_fd, BLKDISCARD, range) == 0) { if (ioctl(vdev_blk->blk_fd, BLKDISCARD, range) == 0) {
g_free(buf); g_free(buf);
@ -267,13 +268,13 @@ static int vub_virtio_process_req(VubDev *vdev_blk,
req->in = (struct virtio_blk_inhdr *)elem->in_sg[in_num - 1].iov_base; req->in = (struct virtio_blk_inhdr *)elem->in_sg[in_num - 1].iov_base;
in_num--; in_num--;
type = le32toh(req->out->type); type = le32_to_cpu(req->out->type);
switch (type & ~VIRTIO_BLK_T_BARRIER) { switch (type & ~VIRTIO_BLK_T_BARRIER) {
case VIRTIO_BLK_T_IN: case VIRTIO_BLK_T_IN:
case VIRTIO_BLK_T_OUT: { case VIRTIO_BLK_T_OUT: {
ssize_t ret = 0; ssize_t ret = 0;
bool is_write = type & VIRTIO_BLK_T_OUT; bool is_write = type & VIRTIO_BLK_T_OUT;
req->sector_num = le64toh(req->out->sector); req->sector_num = le64_to_cpu(req->out->sector);
if (is_write) { if (is_write) {
ret = vub_writev(req, &elem->out_sg[1], out_num); ret = vub_writev(req, &elem->out_sg[1], out_num);
} else { } else {

16
contrib/vhost-user-input/main.c
View File

@ -51,8 +51,8 @@ static void vi_input_send(VuInput *vi, struct virtio_input_event *event)
vi->queue[vi->qindex++].event = *event; vi->queue[vi->qindex++].event = *event;
/* ... until we see a report sync ... */ /* ... until we see a report sync ... */
if (event->type != htole16(EV_SYN) || if (event->type != cpu_to_le16(EV_SYN) ||
event->code != htole16(SYN_REPORT)) { event->code != cpu_to_le16(SYN_REPORT)) {
return; return;
} }
@ -103,9 +103,9 @@ vi_evdev_watch(VuDev *dev, int condition, void *data)
g_debug("input %d %d %d", evdev.type, evdev.code, evdev.value); g_debug("input %d %d %d", evdev.type, evdev.code, evdev.value);
virtio.type = htole16(evdev.type); virtio.type = cpu_to_le16(evdev.type);
virtio.code = htole16(evdev.code); virtio.code = cpu_to_le16(evdev.code);
virtio.value = htole32(evdev.value); virtio.value = cpu_to_le32(evdev.value);
vi_input_send(vi, &virtio); vi_input_send(vi, &virtio);
} }
} }
@ -124,9 +124,9 @@ static void vi_handle_status(VuInput *vi, virtio_input_event *event)
evdev.input_event_sec = tval.tv_sec; evdev.input_event_sec = tval.tv_sec;
evdev.input_event_usec = tval.tv_usec; evdev.input_event_usec = tval.tv_usec;
evdev.type = le16toh(event->type); evdev.type = le16_to_cpu(event->type);
evdev.code = le16toh(event->code); evdev.code = le16_to_cpu(event->code);
evdev.value = le32toh(event->value); evdev.value = le32_to_cpu(event->value);
rc = write(vi->evdevfd, &evdev, sizeof(evdev)); rc = write(vi->evdevfd, &evdev, sizeof(evdev));
if (rc == -1) { if (rc == -1) {