From nobody Tue Oct 22 22:31:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1718197518; cv=none; d=zohomail.com; s=zohoarc; b=k7uYVl0D1g8EfOyM0FfQ3fOktEfVYH3YkaA5CVoRiJuxdNaOYOwytuEn/zrJb/et6CjlfOUJT6WXBffG3XrHfFnF6pHU8JAGlxMk9NFlR5NT8mDG5UsKd1O6VNJLqev/DbwKjeNMavgabtHCOymnSccwxkXZwcVrOR3KBuFWEco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718197518; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+P1PLaujH+XkcZwoLm4xtgpPOnPZM5w6BOv7shY81Ks=; b=oB+PGhYL0LfJZRkGjeh9pYRe/Ss3LLyJInBLQuZ+MJawPpxpxST59LSUgPUzKI/g1n3Rz6rcTZUUNS6LTQ9JqJz1F3Rqgnu3ig7xr7VmZlYO83NKiGCTBCcAWaNfcnb2Na86zeZk0HF7Lm0MFHMkGI9egbEtg0pE1mbq5uhhIbA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1718197517920728.7303489722187; Wed, 12 Jun 2024 06:05:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNdF-0006bz-1L; Wed, 12 Jun 2024 09:03:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sHNdD-0006ZX-Kp for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:03:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sHNdB-0008DO-Nn for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:03:15 -0400 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-584-yNSQfBPXOoySzWD0c4DGBQ-1; Wed, 12 Jun 2024 09:03:11 -0400 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-797d167a402so139558185a.2 for ; Wed, 12 Jun 2024 06:03:10 -0700 (PDT) Received: from step1.redhat.com ([193.207.132.52]) by smtp.gmail.com with ESMTPSA id af79cd13be357-795518c1ff5sm416653485a.70.2024.06.12.06.02.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 06:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718197393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+P1PLaujH+XkcZwoLm4xtgpPOnPZM5w6BOv7shY81Ks=; b=dlJRHFi4PwQDKHh1wj1dZ8K7Yepa6abUjTQQBpn+FXPFTkRqm9ViU1U7yWOwzBGl3JYTVq SpiRoTTbB7JU9tcuV+mqVAAksyAHW86SEvw0UX6iuuFl9oq1CPT/0Co66DzD/wZf7DeyZQ NDCwfxG2+KDweimEznMGvoCFSByfaJ4= X-MC-Unique: yNSQfBPXOoySzWD0c4DGBQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718197386; x=1718802186; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+P1PLaujH+XkcZwoLm4xtgpPOnPZM5w6BOv7shY81Ks=; b=rYSlMgdxiVpN6TQ01+eAyInXFQiQgA3SvtZA0Q1dutM4stn0XFmRsyx1hpvaXdEQX2 uKnADIolTkAu0qT8J8WVsSA80kTTXdkOWj8M68gr1M+8w2ubt7c0Q51HKYPyvBulGBhP i/tS09xRRqZiyBs55aobEt3dwIgift8jtSEr/OrTA65CQt/7ddW2tM5MWuCYmCG5fJG5 s2ynNTbBUl0H94Q5+PYfVyiD2H/52aIUROQSUOF0ib/5uVuJqeR+a8YncKSMAhAcha0M xIi0ruXjNPL1ZJVSt3Wg5T0AMdcYNQPR0iZpuj2nvY/NKddcnw6dN1d+9K17UvJPvhSv A0rg== X-Forwarded-Encrypted: i=1; AJvYcCUdY6ruVQHkvxJzxaFanLFJN8Hk8/ksvPTnRdifNoAEd7d8dD+YdZtXvJQbUx3sd7bvuTOO8rLHKotO9tJMMRNdJmW5yXo= X-Gm-Message-State: AOJu0YwOVx1dymV/eYD6DCWW386Giq+WRITnPsLrctdAXi3v4X9HDW6/ +HUM2M5KVaikN1GPqyaxotxCncK5qo5FX6sOMXDFZ+Ab+E9STbMkYZBl6Nrn3/s3yKGEVtLwErd PI93z5twNS/rksyygkubNBM6e1l/hgng9mLGWroC1Ky/SPo4BYCUy X-Received: by 2002:a05:620a:4711:b0:795:59bb:ccbe with SMTP id af79cd13be357-797f619ff77mr162367585a.74.1718197386458; Wed, 12 Jun 2024 06:03:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGLD2u3eQYKzlnXhr9Nz7KnLuuGj97fZ/pn3bFDAc6ScjutUXxhDusL43WzAmCbpU00xc9iiw== X-Received: by 2002:a05:620a:4711:b0:795:59bb:ccbe with SMTP id af79cd13be357-797f619ff77mr162364485a.74.1718197386080; Wed, 12 Jun 2024 06:03:06 -0700 (PDT) From: Stefano Garzarella To: mst@redhat.com, qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Brad Smith , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Laurent Vivier , gmaglione@redhat.com, stefanha@redhat.com, Coiby Xu , Gerd Hoffmann , slp@redhat.com, Igor Mammedov , Raphael Norwitz , Thomas Huth , Eduardo Habkost , David Hildenbrand , Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jason Wang , Markus Armbruster , Eric Blake , Stefano Garzarella Subject: [PATCH RESEND v7 06/12] contrib/vhost-user-*: use QEMU bswap helper functions Date: Wed, 12 Jun 2024 15:01:34 +0200 Message-ID: <20240612130140.63004-7-sgarzare@redhat.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240612130140.63004-1-sgarzare@redhat.com> References: <20240612130140.63004-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=sgarzare@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1718197519982100002 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=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Stefan Hajnoczi Reviewed-by: David Hildenbrand Signed-off-by: Stefano Garzarella --- 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-b= lk/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 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/bswap.h" #include "standard-headers/linux/virtio_blk.h" #include "libvhost-user-glib.h" =20 @@ -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 =3D req->vdev_blk; desc =3D buf; - uint64_t range[2] =3D { le64toh(desc->sector) << 9, - le32toh(desc->num_sectors) << 9 }; + uint64_t range[2] =3D { le64_to_cpu(desc->sector) << 9, + le32_to_cpu(desc->num_sectors) << 9 }; if (type =3D=3D VIRTIO_BLK_T_DISCARD) { if (ioctl(vdev_blk->blk_fd, BLKDISCARD, range) =3D=3D 0) { g_free(buf); @@ -267,13 +268,13 @@ static int vub_virtio_process_req(VubDev *vdev_blk, req->in =3D (struct virtio_blk_inhdr *)elem->in_sg[in_num - 1].iov_bas= e; in_num--; =20 - type =3D le32toh(req->out->type); + type =3D 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 =3D 0; bool is_write =3D type & VIRTIO_BLK_T_OUT; - req->sector_num =3D le64toh(req->out->sector); + req->sector_num =3D le64_to_cpu(req->out->sector); if (is_write) { ret =3D vub_writev(req, &elem->out_sg[1], out_num); } else { diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/mai= n.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_inpu= t_event *event) vi->queue[vi->qindex++].event =3D *event; =20 /* ... until we see a report sync ... */ - if (event->type !=3D htole16(EV_SYN) || - event->code !=3D htole16(SYN_REPORT)) { + if (event->type !=3D cpu_to_le16(EV_SYN) || + event->code !=3D cpu_to_le16(SYN_REPORT)) { return; } =20 @@ -103,9 +103,9 @@ vi_evdev_watch(VuDev *dev, int condition, void *data) =20 g_debug("input %d %d %d", evdev.type, evdev.code, evdev.value); =20 - virtio.type =3D htole16(evdev.type); - virtio.code =3D htole16(evdev.code); - virtio.value =3D htole32(evdev.value); + virtio.type =3D cpu_to_le16(evdev.type); + virtio.code =3D cpu_to_le16(evdev.code); + virtio.value =3D 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) =20 evdev.input_event_sec =3D tval.tv_sec; evdev.input_event_usec =3D tval.tv_usec; - evdev.type =3D le16toh(event->type); - evdev.code =3D le16toh(event->code); - evdev.value =3D le32toh(event->value); + evdev.type =3D le16_to_cpu(event->type); + evdev.code =3D le16_to_cpu(event->code); + evdev.value =3D le32_to_cpu(event->value); =20 rc =3D write(vi->evdevfd, &evdev, sizeof(evdev)); if (rc =3D=3D -1) { --=20 2.45.2