Allow disabling IDE block mode, by Carlo Marcelo Arenas Belon.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2484 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/ide.c b/hw/ide.c
index 9e5451f..d9c02ab 100644 (file)
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -1631,9 +1631,9 @@ static void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val)
             ide_set_irq(s);
             break;
         case WIN_SETMULT:
-            if ((s->nsector & 0xff) > MAX_MULT_SECTORS ||
-                s->nsector == 0 ||
-                (s->nsector & (s->nsector - 1)) != 0) {
+            if ((s->nsector & 0xff) != 0 &&
+                ((s->nsector & 0xff) > MAX_MULT_SECTORS ||
+                 (s->nsector & (s->nsector - 1)) != 0)) {
                 ide_abort_command(s);
             } else {
                 s->mult_sectors = s->nsector & 0xff;