Re: [Qemu-devel] [1.0 release work] Fix regressions found on recent KVM autotest qemu master 'sanity' jobs

[Kevin Wolf]

Am 04.11.2011 17:40, schrieb Lucas Meneghel Rodrigues:
> 2) The floppy regression problem which was reported some days ago on 
> this mailing list still happens, Kevin did post a patch that resolves it
> 
> [...]
> 
> But still wasn't integrated upstream. As I understand, there are doubts 
> whether this is a proper fix. Works with qemu-kvm.git. RHEL 5 and RHEL 6.

The first patch was buggy (even though it seemed to do the trick in most
cases), but I do have a new version queued for my next pull request.

In case you like to test it before it gets merged, this is the new version:

diff --git a/hw/dma.c b/hw/dma.c
index 8a7302a..0a9322d 100644
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -358,6 +358,14 @@ static void DMA_run (void)
     struct dma_cont *d;
     int icont, ichan;
     int rearm = 0;
+    static int running = 0;
+
+    if (running) {
+        rearm = 1;
+        goto out;
+    } else {
+        running = 1;
+    }

     d = dma_controllers;

@@ -374,6 +382,8 @@ static void DMA_run (void)
         }
     }

+    running = 0;
+out:
     if (rearm)
         qemu_bh_schedule_idle(dma_bh);
 }

Kevin