Attachment 154763 Details for Bug 240009 – Patch to pass structure instead of pointers to the IDE DMA thread.

[patch] Patch to pass structure instead of pointers to the IDE DMA thread.

xen-safe-ide-dma.patch (text/plain), 1.66 KB, created by Richard W.M. Jones on 2007-05-15 19:05:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard W.M. Jones

Created: 2007-05-15 19:05:40 UTC

Size: 1.66 KB

patch

obsolete

>--- tools/ioemu/hw/ide.c.old	2007-05-15 14:02:34.000000000 +0100
>+++ tools/ioemu/hw/ide.c	2007-05-15 19:25:06.000000000 +0100
>@@ -402,10 +402,36 @@
> static void ide_dma_loop(BMDMAState *bm);
> static void dma_thread_loop(BMDMAState *bm);
> 
>+static int
>+really_read (int fd, void *buf, size_t size)
>+{
>+    int r;
>+
>+again:
>+    r = read (fd, buf, size);
>+    if (r <= 0 || r == size) return r;
>+    buf += r;
>+    size -= r;
>+    goto again;
>+}
>+
>+static int
>+really_write (int fd, void *buf, size_t size)
>+{
>+    int r;
>+
>+again:
>+    r = write (fd, buf, size);
>+    if (r == -1 || r == size) return r;
>+    buf += r;
>+    size -= r;
>+    goto again;
>+}
>+
> extern int suspend_requested;
> static void *dma_thread_func(void* opaque)
> {
>-    BMDMAState* req;
>+    BMDMAState req;
>     fd_set fds;
>     int rv, nfds = file_pipes[0] + 1;
>     struct timeval tm;
>@@ -420,9 +446,12 @@
>         rv = select(nfds, &fds, NULL, NULL, &tm);
>         
>         if (rv != 0) {
>-            if (read(file_pipes[0], &req, sizeof(req)) == 0)
>+            rv = really_read(file_pipes[0], &req, sizeof(req));
>+	    if (rv <= 0) {
>+		if (rv == -1) perror ("qemu-dm: read");
>                 return NULL;
>-            dma_thread_loop(req);
>+	    }
>+            dma_thread_loop(&req);
>         } else {
>             if (suspend_requested)  {
>                 /* Need to tidy up the DMA thread so that we don't end up 
>@@ -2371,7 +2400,8 @@
> #ifdef DMA_MULTI_THREAD
> static void ide_dma_loop(BMDMAState *bm)
> {
>-    write(file_pipes[1], &bm, sizeof(bm));
>+    if (really_write(file_pipes[1], bm, sizeof(*bm)) == -1)
>+	perror ("qemu-dm: write");
> }
> static void dma_thread_loop(BMDMAState *bm)
> #else  /* DMA_MULTI_THREAD */

Actions: View | Diff

Attachments on bug 240009: 154641 | 154722 | 154763 | 154836