* [PATCH v2] hw/scsi/megasas: Simplify using the ldst API
@ 2021-12-18 11:19 Philippe Mathieu-Daudé
2022-01-12 14:30 ` Laurent Vivier
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-18 11:19 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Hannes Reinecke, qemu-block, qemu-trivial,
Richard Henderson, Paolo Bonzini, Philippe Mathieu-Daudé
This code is easier to review using the load/store API.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2: Fixed offset in megasas_setup_inquiry (rth)
---
hw/scsi/megasas.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 619b66ef0f3..9a4e9ba87e6 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -375,8 +375,7 @@ static int megasas_setup_inquiry(uint8_t *cdb, int pg, int len)
cdb[1] = 0x1;
cdb[2] = pg;
}
- cdb[3] = (len >> 8) & 0xff;
- cdb[4] = (len & 0xff);
+ stw_be_p(&cdb[3], len);
return len;
}
@@ -392,18 +391,8 @@ static void megasas_encode_lba(uint8_t *cdb, uint64_t lba,
} else {
cdb[0] = READ_16;
}
- cdb[2] = (lba >> 56) & 0xff;
- cdb[3] = (lba >> 48) & 0xff;
- cdb[4] = (lba >> 40) & 0xff;
- cdb[5] = (lba >> 32) & 0xff;
- cdb[6] = (lba >> 24) & 0xff;
- cdb[7] = (lba >> 16) & 0xff;
- cdb[8] = (lba >> 8) & 0xff;
- cdb[9] = (lba) & 0xff;
- cdb[10] = (len >> 24) & 0xff;
- cdb[11] = (len >> 16) & 0xff;
- cdb[12] = (len >> 8) & 0xff;
- cdb[13] = (len) & 0xff;
+ stq_be_p(&cdb[2], lba);
+ stl_be_p(&cdb[2 + 8], len);
}
/*
--
2.33.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2] hw/scsi/megasas: Simplify using the ldst API
2021-12-18 11:19 [PATCH v2] hw/scsi/megasas: Simplify using the ldst API Philippe Mathieu-Daudé
@ 2022-01-12 14:30 ` Laurent Vivier
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Vivier @ 2022-01-12 14:30 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Fam Zheng, Hannes Reinecke, qemu-block, qemu-trivial,
Richard Henderson, Paolo Bonzini
Le 18/12/2021 à 12:19, Philippe Mathieu-Daudé a écrit :
> This code is easier to review using the load/store API.
>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v2: Fixed offset in megasas_setup_inquiry (rth)
> ---
> hw/scsi/megasas.c | 17 +++--------------
> 1 file changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
> index 619b66ef0f3..9a4e9ba87e6 100644
> --- a/hw/scsi/megasas.c
> +++ b/hw/scsi/megasas.c
> @@ -375,8 +375,7 @@ static int megasas_setup_inquiry(uint8_t *cdb, int pg, int len)
> cdb[1] = 0x1;
> cdb[2] = pg;
> }
> - cdb[3] = (len >> 8) & 0xff;
> - cdb[4] = (len & 0xff);
> + stw_be_p(&cdb[3], len);
> return len;
> }
>
> @@ -392,18 +391,8 @@ static void megasas_encode_lba(uint8_t *cdb, uint64_t lba,
> } else {
> cdb[0] = READ_16;
> }
> - cdb[2] = (lba >> 56) & 0xff;
> - cdb[3] = (lba >> 48) & 0xff;
> - cdb[4] = (lba >> 40) & 0xff;
> - cdb[5] = (lba >> 32) & 0xff;
> - cdb[6] = (lba >> 24) & 0xff;
> - cdb[7] = (lba >> 16) & 0xff;
> - cdb[8] = (lba >> 8) & 0xff;
> - cdb[9] = (lba) & 0xff;
> - cdb[10] = (len >> 24) & 0xff;
> - cdb[11] = (len >> 16) & 0xff;
> - cdb[12] = (len >> 8) & 0xff;
> - cdb[13] = (len) & 0xff;
> + stq_be_p(&cdb[2], lba);
> + stl_be_p(&cdb[2 + 8], len);
> }
>
> /*
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-12 15:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-18 11:19 [PATCH v2] hw/scsi/megasas: Simplify using the ldst API Philippe Mathieu-Daudé
2022-01-12 14:30 ` Laurent Vivier
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).