From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya5ej-0005Cg-FS for qemu-devel@nongnu.org; Mon, 23 Mar 2015 12:56:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ya5ei-00038N-IS for qemu-devel@nongnu.org; Mon, 23 Mar 2015 12:56:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya5ei-00037r-CT for qemu-devel@nongnu.org; Mon, 23 Mar 2015 12:56:48 -0400 From: John Snow Date: Mon, 23 Mar 2015 12:56:36 -0400 Message-Id: <1427129798-21590-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1427129798-21590-1-git-send-email-jsnow@redhat.com> References: <1427129798-21590-1-git-send-email-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/4] ide: fix cmd_read_pio when nsectors > 1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com Similar to the cmd_write_pio fix, update the nsector count and ide sector before we invoke ide_transfer_start. Signed-off-by: John Snow Reviewed-by: Stefan Hajnoczi Tested-by: Andreas F=C3=A4rber Message-id: 1426811056-2202-3-git-send-email-jsnow@redhat.com --- hw/ide/core.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 0e9da64..a895fd8 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -587,14 +587,12 @@ static void ide_sector_read_cb(void *opaque, int re= t) n =3D s->req_nb_sectors; } =20 + ide_set_sector(s, ide_get_sector(s) + n); + s->nsector -=3D n; /* Allow the guest to read the io_buffer */ ide_transfer_start(s, s->io_buffer, n * BDRV_SECTOR_SIZE, ide_sector= _read); - - ide_set_irq(s->bus); - - ide_set_sector(s, ide_get_sector(s) + n); - s->nsector -=3D n; s->io_buffer_offset +=3D 512 * n; + ide_set_irq(s->bus); } =20 static void ide_sector_read(IDEState *s) --=20 2.1.0