From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, jsnow@redhat.com
Subject: [Qemu-devel] [PATCH 2/4] ide: fix cmd_read_pio when nsectors > 1
Date: Mon, 23 Mar 2015 12:56:36 -0400 [thread overview]
Message-ID: <1427129798-21590-3-git-send-email-jsnow@redhat.com> (raw)
In-Reply-To: <1427129798-21590-1-git-send-email-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 <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Andreas Färber <afaerber@suse.de>
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 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
next prev parent reply other threads:[~2015-03-23 16:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-23 16:56 [Qemu-devel] [PATCH 0/4] Ide patches for 2.3-rc1 John Snow
2015-03-23 16:56 ` [Qemu-devel] [PATCH 1/4] ide: fix cmd_write_pio when nsectors > 1 John Snow
2015-03-23 16:56 ` John Snow [this message]
2015-03-23 16:56 ` [Qemu-devel] [PATCH 3/4] ahci: Fix sglist offset manipulation for BE machines John Snow
2015-03-23 16:56 ` [Qemu-devel] [PATCH 4/4] ahci-test: improve rw buffer patterns John Snow
2015-03-31 20:55 ` Ed Maste
2015-03-31 20:58 ` John Snow
2015-03-31 21:29 ` Ed Maste
2015-03-31 21:44 ` John Snow
2015-03-31 21:55 ` Ed Maste
2015-03-31 22:01 ` John Snow
2015-04-01 0:29 ` Ed Maste
2015-04-01 0:34 ` John Snow
2015-03-23 16:57 ` [Qemu-devel] [PATCH 0/4] Ide patches for 2.3-rc1 John Snow
2015-03-23 17:56 ` Peter Maydell
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=1427129798-21590-3-git-send-email-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).