From: Anthony Liguori <anthony@codemonkey.ws>
To: Rusty Russell <rusty@rustcorp.com.au>, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 6/7] hw/scsi/virtio-scsi: use virtio wrappers to access headers.
Date: Thu, 08 Aug 2013 08:33:31 -0500 [thread overview]
Message-ID: <87a9ksgvdg.fsf@codemonkey.ws> (raw)
In-Reply-To: <1375938949-22622-7-git-send-email-rusty@rustcorp.com.au>
Rusty Russell <rusty@rustcorp.com.au> writes:
> Note that st*_raw and ld*_raw are effectively replaced by st*_p and ld*_p.
>
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Regards,
Anthony Liguori
> ---
> hw/scsi/virtio-scsi.c | 33 +++++++++++++++++----------------
> 1 file changed, 17 insertions(+), 16 deletions(-)
>
> diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
> index 08dd3f3..c417087 100644
> --- a/hw/scsi/virtio-scsi.c
> +++ b/hw/scsi/virtio-scsi.c
> @@ -18,6 +18,7 @@
> #include <hw/scsi/scsi.h>
> #include <block/scsi.h>
> #include <hw/virtio/virtio-bus.h>
> +#include "hw/virtio/virtio-access.h"
>
> typedef struct VirtIOSCSIReq {
> VirtIOSCSI *dev;
> @@ -307,12 +308,12 @@ static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status,
> req->resp.cmd->response = VIRTIO_SCSI_S_OK;
> req->resp.cmd->status = status;
> if (req->resp.cmd->status == GOOD) {
> - req->resp.cmd->resid = tswap32(resid);
> + req->resp.cmd->resid = virtio_tswap32(resid);
> } else {
> req->resp.cmd->resid = 0;
> sense_len = scsi_req_get_sense(r, req->resp.cmd->sense,
> VIRTIO_SCSI_SENSE_SIZE);
> - req->resp.cmd->sense_len = tswap32(sense_len);
> + req->resp.cmd->sense_len = virtio_tswap32(sense_len);
> }
> virtio_scsi_complete_req(req);
> }
> @@ -408,16 +409,16 @@ static void virtio_scsi_get_config(VirtIODevice *vdev,
> VirtIOSCSIConfig *scsiconf = (VirtIOSCSIConfig *)config;
> VirtIOSCSICommon *s = VIRTIO_SCSI_COMMON(vdev);
>
> - stl_raw(&scsiconf->num_queues, s->conf.num_queues);
> - stl_raw(&scsiconf->seg_max, 128 - 2);
> - stl_raw(&scsiconf->max_sectors, s->conf.max_sectors);
> - stl_raw(&scsiconf->cmd_per_lun, s->conf.cmd_per_lun);
> - stl_raw(&scsiconf->event_info_size, sizeof(VirtIOSCSIEvent));
> - stl_raw(&scsiconf->sense_size, s->sense_size);
> - stl_raw(&scsiconf->cdb_size, s->cdb_size);
> - stw_raw(&scsiconf->max_channel, VIRTIO_SCSI_MAX_CHANNEL);
> - stw_raw(&scsiconf->max_target, VIRTIO_SCSI_MAX_TARGET);
> - stl_raw(&scsiconf->max_lun, VIRTIO_SCSI_MAX_LUN);
> + virtio_stl_p(&scsiconf->num_queues, s->conf.num_queues);
> + virtio_stl_p(&scsiconf->seg_max, 128 - 2);
> + virtio_stl_p(&scsiconf->max_sectors, s->conf.max_sectors);
> + virtio_stl_p(&scsiconf->cmd_per_lun, s->conf.cmd_per_lun);
> + virtio_stl_p(&scsiconf->event_info_size, sizeof(VirtIOSCSIEvent));
> + virtio_stl_p(&scsiconf->sense_size, s->sense_size);
> + virtio_stl_p(&scsiconf->cdb_size, s->cdb_size);
> + virtio_stw_p(&scsiconf->max_channel, VIRTIO_SCSI_MAX_CHANNEL);
> + virtio_stw_p(&scsiconf->max_target, VIRTIO_SCSI_MAX_TARGET);
> + virtio_stl_p(&scsiconf->max_lun, VIRTIO_SCSI_MAX_LUN);
> }
>
> static void virtio_scsi_set_config(VirtIODevice *vdev,
> @@ -426,14 +427,14 @@ static void virtio_scsi_set_config(VirtIODevice *vdev,
> VirtIOSCSIConfig *scsiconf = (VirtIOSCSIConfig *)config;
> VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
>
> - if ((uint32_t) ldl_raw(&scsiconf->sense_size) >= 65536 ||
> - (uint32_t) ldl_raw(&scsiconf->cdb_size) >= 256) {
> + if ((uint32_t) virtio_ldl_p(&scsiconf->sense_size) >= 65536 ||
> + (uint32_t) virtio_ldl_p(&scsiconf->cdb_size) >= 256) {
> error_report("bad data written to virtio-scsi configuration space");
> exit(1);
> }
>
> - vs->sense_size = ldl_raw(&scsiconf->sense_size);
> - vs->cdb_size = ldl_raw(&scsiconf->cdb_size);
> + vs->sense_size = virtio_ldl_p(&scsiconf->sense_size);
> + vs->cdb_size = virtio_ldl_p(&scsiconf->cdb_size);
> }
>
> static uint32_t virtio_scsi_get_features(VirtIODevice *vdev,
> --
> 1.8.1.2
next prev parent reply other threads:[~2013-08-08 13:33 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 5:15 [Qemu-devel] [PATCH 0/7] Virtio support for endian-curious guests Rusty Russell
2013-08-08 5:15 ` [Qemu-devel] [PATCH 1/7] virtio: allow byte swapping for vring and config access Rusty Russell
2013-08-08 13:31 ` Anthony Liguori
2013-08-08 14:28 ` Andreas Färber
2013-08-08 15:40 ` Anthony Liguori
2013-08-08 15:45 ` Daniel P. Berrange
2013-08-08 16:07 ` Anthony Liguori
2013-08-08 16:14 ` Peter Maydell
2013-08-08 16:25 ` Anthony Liguori
2013-08-08 16:30 ` Peter Maydell
2013-08-09 2:58 ` Rusty Russell
2013-08-09 4:39 ` Anton Blanchard
2013-08-09 8:05 ` Peter Maydell
2013-08-09 14:16 ` Anthony Liguori
2013-08-08 15:48 ` Peter Maydell
2013-08-08 16:11 ` Anthony Liguori
2013-08-08 16:24 ` Andreas Färber
2013-08-09 7:35 ` Rusty Russell
2013-08-09 7:42 ` Peter Maydell
2013-08-12 7:49 ` Rusty Russell
2013-08-09 7:49 ` Benjamin Herrenschmidt
2013-08-12 0:28 ` Rusty Russell
2013-08-12 0:49 ` Benjamin Herrenschmidt
2013-08-09 15:15 ` Andreas Färber
2013-08-09 0:08 ` Rusty Russell
2013-08-09 7:00 ` Rusty Russell
2013-08-09 14:24 ` Andreas Färber
2013-08-09 6:40 ` Rusty Russell
2013-08-09 14:10 ` Anthony Liguori
2013-08-11 23:46 ` Rusty Russell
2013-08-08 5:15 ` [Qemu-devel] [PATCH 2/7] target-ppc: ppc64 targets can be either endian Rusty Russell
2013-08-08 5:15 ` [Qemu-devel] [PATCH 3/7] hw/net/virtio-net: use virtio wrappers to access headers Rusty Russell
2013-08-08 13:32 ` Anthony Liguori
2013-08-08 5:15 ` [Qemu-devel] [PATCH 4/7] hw/net/virtio-balloon: use virtio wrappers to access page frame numbers Rusty Russell
2013-08-08 13:32 ` Anthony Liguori
2013-08-08 5:15 ` [Qemu-devel] [PATCH 5/7] hw/block/virtio-blk: use virtio wrappers to access headers Rusty Russell
2013-08-08 9:57 ` Peter Maydell
2013-08-08 13:32 ` Anthony Liguori
2013-08-08 5:15 ` [Qemu-devel] [PATCH 6/7] hw/scsi/virtio-scsi: " Rusty Russell
2013-08-08 13:33 ` Anthony Liguori [this message]
2013-08-08 5:15 ` [Qemu-devel] [PATCH 7/7] hw/char/virtio-serial-bus: " Rusty Russell
2013-08-08 13:34 ` Anthony Liguori
2013-08-08 5:15 ` [Qemu-devel] [PATCH 7/7] patch virtio-serial-biendian.patch Rusty Russell
-- strict thread matches above, loose matches on Subject: below --
2013-10-17 3:53 [Qemu-devel] [PATCH 0/7] virtio endian-ambivalent target fixes Rusty Russell
2013-10-17 3:53 ` [Qemu-devel] [PATCH 6/7] hw/scsi/virtio-scsi: use virtio wrappers to access headers Rusty Russell
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=87a9ksgvdg.fsf@codemonkey.ws \
--to=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
--cc=rusty@rustcorp.com.au \
/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).