From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:58997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gs6YV-0000RK-U3 for qemu-devel@nongnu.org; Fri, 08 Feb 2019 08:51:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gs6YT-0005st-TY for qemu-devel@nongnu.org; Fri, 08 Feb 2019 08:50:59 -0500 From: Stefano Garzarella Date: Fri, 8 Feb 2019 14:49:49 +0100 Message-Id: <20190208134950.187665-6-sgarzare@redhat.com> In-Reply-To: <20190208134950.187665-1-sgarzare@redhat.com> References: <20190208134950.187665-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 5/6] tests/virtio-blk: change assert on data_size in virtio_blk_request() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Max Reitz , "Dr . David Alan Gilbert" , "Michael S. Tsirkin" , Eduardo Habkost , Kevin Wolf , qemu-block@nongnu.org, Thomas Huth , Marcel Apfelbaum , Stefan Hajnoczi , Paolo Bonzini The size of data in the virtio_blk_request must be a multiple of 512 bytes for IN and OUT requests, or a multiple of the size of struct virtio_blk_discard_write_zeroes for DISCARD and WRITE_ZEROES requests. Reviewed-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Signed-off-by: Stefano Garzarella --- tests/virtio-blk-test.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 04c608764b..0739498da7 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -144,7 +144,20 @@ static uint64_t virtio_blk_request(QGuestAllocator *= alloc, QVirtioDevice *d, uint64_t addr; uint8_t status =3D 0xFF; =20 - g_assert_cmpuint(data_size % 512, =3D=3D, 0); + switch (req->type) { + case VIRTIO_BLK_T_IN: + case VIRTIO_BLK_T_OUT: + g_assert_cmpuint(data_size % 512, =3D=3D, 0); + break; + case VIRTIO_BLK_T_DISCARD: + case VIRTIO_BLK_T_WRITE_ZEROES: + g_assert_cmpuint(data_size % + sizeof(struct virtio_blk_discard_write_zeroes),= =3D=3D, 0); + break; + default: + g_assert_cmpuint(data_size, =3D=3D, 0); + } + addr =3D guest_alloc(alloc, sizeof(*req) + data_size); =20 virtio_blk_fix_request(d, req); --=20 2.20.1