From: Stefano Garzarella <sgarzare@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Jason Wang" <jasowang@redhat.com>,
"Coiby Xu" <Coiby.Xu@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
qemu-block@nongnu.org, "Daniel P. Berrangé" <berrange@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
slp@redhat.com, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Brad Smith" <brad@comstyle.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Thomas Huth" <thuth@redhat.com>,
"Eric Blake" <eblake@redhat.com>, "Kevin Wolf" <kwolf@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Raphael Norwitz" <raphael@enfabrica.net>,
gmaglione@redhat.com, "Laurent Vivier" <lvivier@redhat.com>,
stefanha@redhat.com, "David Hildenbrand" <david@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PATCH v4 06/12] contrib/vhost-user-*: use QEMU bswap helper functions
Date: Wed, 8 May 2024 09:44:50 +0200 [thread overview]
Message-ID: <20240508074457.12367-7-sgarzare@redhat.com> (raw)
In-Reply-To: <20240508074457.12367-1-sgarzare@redhat.com>
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>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
contrib/vhost-user-blk/vhost-user-blk.c | 9 +++++----
contrib/vhost-user-input/main.c | 16 ++++++++--------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
index a8ab9269a2..9492146855 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -16,6 +16,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "standard-headers/linux/virtio_blk.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)
VubDev *vdev_blk = req->vdev_blk;
desc = buf;
- uint64_t range[2] = { le64toh(desc->sector) << 9,
- le32toh(desc->num_sectors) << 9 };
+ uint64_t range[2] = { le64_to_cpu(desc->sector) << 9,
+ le32_to_cpu(desc->num_sectors) << 9 };
if (type == VIRTIO_BLK_T_DISCARD) {
if (ioctl(vdev_blk->blk_fd, BLKDISCARD, range) == 0) {
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;
in_num--;
- type = le32toh(req->out->type);
+ type = le32_to_cpu(req->out->type);
switch (type & ~VIRTIO_BLK_T_BARRIER) {
case VIRTIO_BLK_T_IN:
case VIRTIO_BLK_T_OUT: {
ssize_t ret = 0;
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) {
ret = vub_writev(req, &elem->out_sg[1], out_num);
} else {
diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
index 081230da54..f3362d41ac 100644
--- a/contrib/vhost-user-input/main.c
+++ b/contrib/vhost-user-input/main.c
@@ -51,8 +51,8 @@ static void vi_input_send(VuInput *vi, struct virtio_input_event *event)
vi->queue[vi->qindex++].event = *event;
/* ... until we see a report sync ... */
- if (event->type != htole16(EV_SYN) ||
- event->code != htole16(SYN_REPORT)) {
+ if (event->type != cpu_to_le16(EV_SYN) ||
+ event->code != cpu_to_le16(SYN_REPORT)) {
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);
- virtio.type = htole16(evdev.type);
- virtio.code = htole16(evdev.code);
- virtio.value = htole32(evdev.value);
+ virtio.type = cpu_to_le16(evdev.type);
+ virtio.code = cpu_to_le16(evdev.code);
+ virtio.value = cpu_to_le32(evdev.value);
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_usec = tval.tv_usec;
- evdev.type = le16toh(event->type);
- evdev.code = le16toh(event->code);
- evdev.value = le32toh(event->value);
+ evdev.type = le16_to_cpu(event->type);
+ evdev.code = le16_to_cpu(event->code);
+ evdev.value = le32_to_cpu(event->value);
rc = write(vi->evdevfd, &evdev, sizeof(evdev));
if (rc == -1) {
--
2.45.0
next prev parent reply other threads:[~2024-05-08 7:48 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 7:44 [PATCH v4 00/12] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 01/12] libvhost-user: set msg.msg_control to NULL when it is empty Stefano Garzarella
2024-05-08 8:57 ` Daniel P. Berrangé
2024-05-08 9:33 ` Stefano Garzarella
2024-05-08 10:23 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 02/12] libvhost-user: fail vu_message_write() if sendmsg() is failing Stefano Garzarella
2024-05-08 8:59 ` Daniel P. Berrangé
2024-05-08 10:23 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 03/12] libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported Stefano Garzarella
2024-05-08 10:39 ` Philippe Mathieu-Daudé
2024-05-10 8:25 ` Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 04/12] vhost-user-server: do not set memory fd non-blocking Stefano Garzarella
2024-05-08 9:00 ` Daniel P. Berrangé
2024-05-08 7:44 ` [PATCH v4 05/12] contrib/vhost-user-blk: fix bind() using the right size of the address Stefano Garzarella
2024-05-08 10:25 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` Stefano Garzarella [this message]
2024-05-08 10:13 ` [PATCH v4 06/12] contrib/vhost-user-*: use QEMU bswap helper functions Philippe Mathieu-Daudé
2024-05-08 10:25 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 07/12] vhost-user: enable frontends on any POSIX system Stefano Garzarella
2024-05-08 10:26 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 08/12] libvhost-user: enable it " Stefano Garzarella
2024-05-08 10:36 ` Philippe Mathieu-Daudé
2024-05-10 8:56 ` Stefano Garzarella
2024-05-10 9:56 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 09/12] contrib/vhost-user-blk: " Stefano Garzarella
2024-05-08 10:32 ` Philippe Mathieu-Daudé
2024-05-10 9:02 ` Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 10/12] hostmem: add a new memory backend based on POSIX shm_open() Stefano Garzarella
2024-05-08 11:59 ` Markus Armbruster
2024-05-10 9:37 ` Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 11/12] tests/qtest/vhost-user-blk-test: use memory-backend-shm Stefano Garzarella
2024-05-10 5:57 ` Thomas Huth
2024-05-10 10:54 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 12/12] tests/qtest/vhost-user-test: add a test case for memory-backend-shm Stefano Garzarella
2024-05-10 5:58 ` Thomas Huth
2024-05-08 10:39 ` [PATCH v4 00/12] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Philippe Mathieu-Daudé
2024-05-09 19:20 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240508074457.12367-7-sgarzare@redhat.com \
--to=sgarzare@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=brad@comstyle.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=gmaglione@redhat.com \
--cc=hreitz@redhat.com \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael@enfabrica.net \
--cc=slp@redhat.com \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).