87c6328bba
Update to v2.3.0-rc0. SeaBIOS does not yet build on 11.4, and rcutorture test fails on ppc. OBS-URL: https://build.opensuse.org/request/show/292199 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=238
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 7d51103f2e1a7ec7fe0623cc115f450d57f442b4 Mon Sep 17 00:00:00 2001
|
|
From: John Snow <jsnow@redhat.com>
|
|
Date: Thu, 19 Mar 2015 20:24:13 -0400
|
|
Subject: [PATCH] ide: fix cmd_write_pio when nsectors > 1
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
We need to adjust the sector being written to
|
|
prior to calling ide_transfer_start, otherwise
|
|
we'll write to the same sector again.
|
|
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
hw/ide/core.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/ide/core.c b/hw/ide/core.c
|
|
index ef52f35..0e9da64 100644
|
|
--- a/hw/ide/core.c
|
|
+++ b/hw/ide/core.c
|
|
@@ -846,6 +846,7 @@ static void ide_sector_write_cb(void *opaque, int ret)
|
|
s->nsector -= n;
|
|
s->io_buffer_offset += 512 * n;
|
|
|
|
+ ide_set_sector(s, ide_get_sector(s) + n);
|
|
if (s->nsector == 0) {
|
|
/* no more sectors to write */
|
|
ide_transfer_stop(s);
|
|
@@ -857,7 +858,6 @@ static void ide_sector_write_cb(void *opaque, int ret)
|
|
ide_transfer_start(s, s->io_buffer, n1 * BDRV_SECTOR_SIZE,
|
|
ide_sector_write);
|
|
}
|
|
- ide_set_sector(s, ide_get_sector(s) + n);
|
|
|
|
if (win2k_install_hack && ((++s->irq_count % 16) == 0)) {
|
|
/* It seems there is a bug in the Windows 2000 installer HDD
|