From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Cornelia Huck <cohuck@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
virtualization@lists.linux-foundation.org,
linux-scsi@vger.kernel.org
Subject: [PATCH v3 16/38] virtio_scsi: correct tags for config space fields
Date: Wed, 5 Aug 2020 09:43:59 -0400 [thread overview]
Message-ID: <20200805134226.1106164-17-mst@redhat.com> (raw)
In-Reply-To: <20200805134226.1106164-1-mst@redhat.com>
Tag config space fields as having virtio endian-ness.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
---
drivers/scsi/virtio_scsi.c | 4 ++--
include/uapi/linux/virtio_scsi.h | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 0e0910c5b942..c36aeb9a1330 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -746,14 +746,14 @@ static struct scsi_host_template virtscsi_host_template = {
#define virtscsi_config_get(vdev, fld) \
({ \
- typeof(((struct virtio_scsi_config *)0)->fld) __val; \
+ __virtio_native_type(struct virtio_scsi_config, fld) __val; \
virtio_cread(vdev, struct virtio_scsi_config, fld, &__val); \
__val; \
})
#define virtscsi_config_set(vdev, fld, val) \
do { \
- typeof(((struct virtio_scsi_config *)0)->fld) __val = (val); \
+ __virtio_native_type(struct virtio_scsi_config, fld) __val = (val); \
virtio_cwrite(vdev, struct virtio_scsi_config, fld, &__val); \
} while(0)
diff --git a/include/uapi/linux/virtio_scsi.h b/include/uapi/linux/virtio_scsi.h
index cc18ef8825c0..0abaae4027c0 100644
--- a/include/uapi/linux/virtio_scsi.h
+++ b/include/uapi/linux/virtio_scsi.h
@@ -103,16 +103,16 @@ struct virtio_scsi_event {
} __attribute__((packed));
struct virtio_scsi_config {
- __u32 num_queues;
- __u32 seg_max;
- __u32 max_sectors;
- __u32 cmd_per_lun;
- __u32 event_info_size;
- __u32 sense_size;
- __u32 cdb_size;
- __u16 max_channel;
- __u16 max_target;
- __u32 max_lun;
+ __virtio32 num_queues;
+ __virtio32 seg_max;
+ __virtio32 max_sectors;
+ __virtio32 cmd_per_lun;
+ __virtio32 event_info_size;
+ __virtio32 sense_size;
+ __virtio32 cdb_size;
+ __virtio16 max_channel;
+ __virtio16 max_target;
+ __virtio32 max_lun;
} __attribute__((packed));
/* Feature Bits */
--
MST
next prev parent reply other threads:[~2020-08-05 19:29 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-05 13:43 [PATCH v3 00/38] virtio: config space endian-ness cleanup Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 01/38] virtio_balloon: fix sparse warning Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 02/38] virtio_ring: sparse warning fixup Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 03/38] virtio: allow __virtioXX, __leXX in config space Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 04/38] virtio_9p: correct tags for config space fields Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 05/38] virtio_balloon: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 06/38] virtio_blk: " Michael S. Tsirkin
2020-08-05 14:24 ` Stefano Garzarella
2020-08-05 13:43 ` [PATCH v3 07/38] virtio_console: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 08/38] virtio_crypto: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 09/38] virtio_fs: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 10/38] virtio_gpu: " Michael S. Tsirkin
2020-08-07 11:22 ` Gerd Hoffmann
2020-08-05 13:43 ` [PATCH v3 11/38] virtio_input: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 12/38] virtio_iommu: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 13/38] virtio_mem: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 14/38] virtio_net: " Michael S. Tsirkin
2020-08-05 13:43 ` [PATCH v3 15/38] virtio_pmem: " Michael S. Tsirkin
2020-08-05 13:43 ` Michael S. Tsirkin [this message]
2020-08-05 13:44 ` [PATCH v3 17/38] virtio_config: disallow native type fields Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 18/38] mlxbf-tmfifo: sparse tags for config access Michael S. Tsirkin
2020-08-05 14:24 ` Andy Shevchenko
2020-08-05 13:44 ` [PATCH v3 19/38] vdpa: make sure set_features is invoked for legacy Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 20/38] vhost/vdpa: switch to new helpers Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 21/38] virtio_vdpa: legacy features handling Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 22/38] vdpa_sim: fix endian-ness of config space Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 23/38] virtio_config: cread/write cleanup Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 24/38] virtio_config: rewrite using _Generic Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 25/38] virtio_config: disallow native type fields (again) Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 26/38] virtio_config: LE config space accessors Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 27/38] virtio_caif: correct tags for config space fields Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 28/38] virtio_config: add virtio_cread_le_feature Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 29/38] virtio_balloon: use LE config space accesses Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 30/38] virtio_input: convert to LE accessors Michael S. Tsirkin
2020-08-19 5:59 ` Gerd Hoffmann
2020-08-05 13:44 ` [PATCH v3 31/38] virtio_fs: " Michael S. Tsirkin
2020-08-06 17:28 ` Vivek Goyal
2020-08-05 13:44 ` [PATCH v3 32/38] virtio_crypto: " Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 33/38] virtio_pmem: " Michael S. Tsirkin
2020-08-07 20:05 ` Ira Weiny
2020-08-05 13:44 ` [PATCH v3 34/38] drm/virtio: " Michael S. Tsirkin
2020-08-07 11:22 ` Gerd Hoffmann
2020-08-05 13:44 ` [PATCH v3 35/38] virtio_mem: " Michael S. Tsirkin
2020-08-10 7:57 ` David Hildenbrand
2020-08-05 13:44 ` [PATCH v3 36/38] virtio-iommu: " Michael S. Tsirkin
2020-08-05 13:44 ` [PATCH v3 37/38] virtio_config: drop LE option from config space Michael S. Tsirkin
2020-08-05 13:45 ` [PATCH v3 38/38] virtio_net: use LE accessors for speed/duplex Michael S. Tsirkin
2020-08-05 13:59 ` Cornelia Huck
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=20200805134226.1106164-17-mst@redhat.com \
--to=mst@redhat.com \
--cc=cohuck@redhat.com \
--cc=jasowang@redhat.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=pbonzini@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/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 NNTP newsgroup(s).