From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYkji-0001YF-J7 for qemu-devel@nongnu.org; Thu, 19 Mar 2015 20:24:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYkjh-0004Vv-Nk for qemu-devel@nongnu.org; Thu, 19 Mar 2015 20:24:26 -0400 From: John Snow Date: Thu, 19 Mar 2015 20:24:14 -0400 Message-Id: <1426811056-2202-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1426811056-2202-1-git-send-email-jsnow@redhat.com> References: <1426811056-2202-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH for-2.3 2/4] ide: fix cmd_read_pio when nsectors > 1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: pbonzini@redhat.com, John Snow , afaerber@suse.de, stefanha@redhat.com, qemu-devel@nongnu.org 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 --- 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 ret) n = s->req_nb_sectors; } + ide_set_sector(s, ide_get_sector(s) + n); + s->nsector -= 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 -= n; s->io_buffer_offset += 512 * n; + ide_set_irq(s->bus); } static void ide_sector_read(IDEState *s) -- 2.1.0