From: Anton Nefedov <anton.nefedov@virtuozzo.com>
To: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Cc: "qemu-block@nongnu.org" <qemu-block@nongnu.org>,
"kwolf@redhat.com" <kwolf@redhat.com>,
"mreitz@redhat.com" <mreitz@redhat.com>,
"armbru@redhat.com" <armbru@redhat.com>,
"jsnow@redhat.com" <jsnow@redhat.com>,
"pbonzini@redhat.com" <pbonzini@redhat.com>,
"famz@redhat.com" <famz@redhat.com>,
"eblake@redhat.com" <eblake@redhat.com>,
Denis Lunev <den@virtuozzo.com>,
"berto@igalia.com" <berto@igalia.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Anton Nefedov <anton.nefedov@virtuozzo.com>
Subject: [Qemu-devel] [PATCH v6 5/9] scsi: store unmap offset and nb_sectors in request struct
Date: Fri, 30 Nov 2018 14:47:22 +0000 [thread overview]
Message-ID: <20181130144705.77454-6-anton.nefedov@virtuozzo.com> (raw)
In-Reply-To: <20181130144705.77454-1-anton.nefedov@virtuozzo.com>
it allows to report it in the error handler
Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
hw/scsi/scsi-disk.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 0e9027c8f3..b1133e6293 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -1604,8 +1604,6 @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
{
SCSIDiskReq *r = data->r;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
- uint64_t sector_num;
- uint32_t nb_sectors;
assert(r->req.aiocb == NULL);
if (scsi_disk_req_check_error(r, ret, false)) {
@@ -1613,16 +1611,16 @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
}
if (data->count > 0) {
- sector_num = ldq_be_p(&data->inbuf[0]);
- nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL;
- if (!check_lba_range(s, sector_num, nb_sectors)) {
+ r->sector = ldq_be_p(&data->inbuf[0]);
+ r->sector_count = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL;
+ if (!check_lba_range(s, r->sector, r->sector_count)) {
scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE));
goto done;
}
r->req.aiocb = blk_aio_pdiscard(s->qdev.conf.blk,
- sector_num * s->qdev.blocksize,
- nb_sectors * s->qdev.blocksize,
+ r->sector * s->qdev.blocksize,
+ r->sector_count * s->qdev.blocksize,
scsi_unmap_complete, data);
data->count--;
data->inbuf += 16;
--
2.17.1
next prev parent reply other threads:[~2018-11-30 14:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-30 14:47 [Qemu-devel] [PATCH v6 0/9] discard blockstats Anton Nefedov
2018-11-30 14:47 ` [Qemu-devel] [PATCH v6 1/9] qapi: group BlockDeviceStats fields Anton Nefedov
2018-11-30 14:47 ` [Qemu-devel] [PATCH v6 2/9] qapi: add unmap to BlockDeviceStats Anton Nefedov
2018-11-30 14:47 ` [Qemu-devel] [PATCH v6 3/9] block: add empty account cookie type Anton Nefedov
2018-11-30 14:47 ` [Qemu-devel] [PATCH v6 4/9] ide: account UNMAP (TRIM) operations Anton Nefedov
2018-11-30 14:47 ` Anton Nefedov [this message]
2018-11-30 14:47 ` [Qemu-devel] [PATCH v6 6/9] scsi: move unmap error checking to the complete callback Anton Nefedov
2018-11-30 14:47 ` [Qemu-devel] [PATCH v6 7/9] scsi: account unmap operations Anton Nefedov
2018-11-30 14:47 ` [Qemu-devel] [PATCH v6 8/9] file-posix: account discard operations Anton Nefedov
2018-11-30 14:47 ` [Qemu-devel] [PATCH v6 9/9] qapi: query-blockstat: add driver specific file-posix stats Anton Nefedov
2018-12-03 14:24 ` Vladimir Sementsov-Ogievskiy
2018-12-13 12:20 ` Markus Armbruster
2018-12-13 15:20 ` Anton Nefedov
2018-12-13 16:05 ` Markus Armbruster
2019-02-21 12:36 ` Markus Armbruster
2019-01-14 13:16 ` [Qemu-devel] [PATCH v6 0/9] discard blockstats Anton Nefedov
2019-02-21 8:02 ` Anton Nefedov
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=20181130144705.77454-6-anton.nefedov@virtuozzo.com \
--to=anton.nefedov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=berto@igalia.com \
--cc=den@virtuozzo.com \
--cc=eblake@redhat.com \
--cc=famz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.