On Thu, Aug 20, 2020 at 06:58:53PM +0200, Philippe Mathieu-Daudé wrote:
> We are going to modify the code in the next commit. Renaming
> the 'resp' variable to 'id' first makes the next commit easier
> to review. No logical changes.
>
> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> block/nvme.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
Reviewed-by: Stefano Garzarella <sgarz...@redhat.com>
>
> diff --git a/block/nvme.c b/block/nvme.c
> index 3101f1ad55d..99822d9fd36 100644
> --- a/block/nvme.c
> +++ b/block/nvme.c
> @@ -510,8 +510,8 @@ static void nvme_identify(BlockDriverState *bs, int
> namespace, Error **errp)
> BDRVNVMeState *s = bs->opaque;
> NvmeIdCtrl *idctrl;
> NvmeIdNs *idns;
> + uint8_t *id;
> NvmeLBAF *lbaf;
> - uint8_t *resp;
> uint16_t oncs;
> int r;
> uint64_t iova;
> @@ -520,14 +520,14 @@ static void nvme_identify(BlockDriverState *bs, int
> namespace, Error **errp)
> .cdw10 = cpu_to_le32(0x1),
> };
>
> - resp = qemu_try_blockalign0(bs, sizeof(NvmeIdCtrl));
> - if (!resp) {
> + id = qemu_try_blockalign0(bs, sizeof(NvmeIdCtrl));
> + if (!id) {
> error_setg(errp, "Cannot allocate buffer for identify response");
> goto out;
> }
> - idctrl = (NvmeIdCtrl *)resp;
> - idns = (NvmeIdNs *)resp;
> - r = qemu_vfio_dma_map(s->vfio, resp, sizeof(NvmeIdCtrl), true, &iova);
> + idctrl = (NvmeIdCtrl *)id;
> + idns = (NvmeIdNs *)id;
> + r = qemu_vfio_dma_map(s->vfio, id, sizeof(NvmeIdCtrl), true, &iova);
> if (r) {
> error_setg(errp, "Cannot map buffer for DMA");
> goto out;
> @@ -554,8 +554,7 @@ static void nvme_identify(BlockDriverState *bs, int
> namespace, Error **errp)
> s->supports_write_zeroes = !!(oncs & NVME_ONCS_WRITE_ZEROS);
> s->supports_discard = !!(oncs & NVME_ONCS_DSM);
>
> - memset(resp, 0, 4096);
> -
> + memset(id, 0, 4096);
> cmd.cdw10 = 0;
> cmd.nsid = cpu_to_le32(namespace);
> if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) {
> @@ -587,8 +586,8 @@ static void nvme_identify(BlockDriverState *bs, int
> namespace, Error **errp)
>
> s->blkshift = lbaf->ds;
> out:
> - qemu_vfio_dma_unmap(s->vfio, resp);
> - qemu_vfree(resp);
> + qemu_vfio_dma_unmap(s->vfio, id);
> + qemu_vfree(id);
> }
>
> static bool nvme_poll_queues(BDRVNVMeState *s)
> --
> 2.26.2
>
>
