Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[qemu.git] / hw / 9pfs / codir.c

diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c
index 65ad3298be9ce2e3b4a4f1ca1fd110cc74c8b02d..7cd6fce1ad3748db5b1a32585d163c07a92290d4 100644 (file)
--- a/hw/9pfs/codir.c
+++ b/hw/9pfs/codir.c
@@ -1,6 +1,5 @@
-

 /*
 /*

- * Virtio 9p backend
+ * 9p backend

  *
  * Copyright IBM, Corp. 2011
  *
  *
  * Copyright IBM, Corp. 2011
  *


@@ -12,13 +11,14 @@
  *
  */
 
  *
  */
 

+#include "qemu/osdep.h"

 #include "fsdev/qemu-fsdev.h"
 #include "qemu/thread.h"
 #include "fsdev/qemu-fsdev.h"
 #include "qemu/thread.h"

-#include "block/coroutine.h"
-#include "virtio-9p-coth.h"
+#include "qemu/coroutine.h"
+#include "coth.h"

 
 

-int v9fs_co_readdir_r(V9fsPDU *pdu, V9fsFidState *fidp, struct dirent *dent,
-                      struct dirent **result)
+int coroutine_fn v9fs_co_readdir(V9fsPDU *pdu, V9fsFidState *fidp,
+                                 struct dirent **dent)

 {
     int err;
     V9fsState *s = pdu->s;
 {
     int err;
     V9fsState *s = pdu->s;


@@ -28,11 +28,14 @@ int v9fs_co_readdir_r(V9fsPDU *pdu, V9fsFidState *fidp, struct dirent *dent,
     }
     v9fs_co_run_in_worker(
         {
     }
     v9fs_co_run_in_worker(
         {

+            struct dirent *entry;
+

             errno = 0;
             errno = 0;

-            err = s->ops->readdir_r(&s->ctx, &fidp->fs, dent, result);
-            if (!*result && errno) {
+            entry = s->ops->readdir(&s->ctx, &fidp->fs);
+            if (!entry && errno) {

                 err = -errno;
             } else {
                 err = -errno;
             } else {

+                *dent = entry;

                 err = 0;
             }
         });
                 err = 0;
             }
         });


@@ -57,7 +60,8 @@ off_t v9fs_co_telldir(V9fsPDU *pdu, V9fsFidState *fidp)
     return err;
 }
 
     return err;
 }
 

-void v9fs_co_seekdir(V9fsPDU *pdu, V9fsFidState *fidp, off_t offset)
+void coroutine_fn v9fs_co_seekdir(V9fsPDU *pdu, V9fsFidState *fidp,
+                                  off_t offset)

 {
     V9fsState *s = pdu->s;
     if (v9fs_request_cancelled(pdu)) {
 {
     V9fsState *s = pdu->s;
     if (v9fs_request_cancelled(pdu)) {


@@ -69,7 +73,7 @@ void v9fs_co_seekdir(V9fsPDU *pdu, V9fsFidState *fidp, off_t offset)
         });
 }
 
         });
 }
 

-void v9fs_co_rewinddir(V9fsPDU *pdu, V9fsFidState *fidp)
+void coroutine_fn v9fs_co_rewinddir(V9fsPDU *pdu, V9fsFidState *fidp)

 {
     V9fsState *s = pdu->s;
     if (v9fs_request_cancelled(pdu)) {
 {
     V9fsState *s = pdu->s;
     if (v9fs_request_cancelled(pdu)) {


@@ -81,8 +85,9 @@ void v9fs_co_rewinddir(V9fsPDU *pdu, V9fsFidState *fidp)
         });
 }
 
         });
 }
 

-int v9fs_co_mkdir(V9fsPDU *pdu, V9fsFidState *fidp, V9fsString *name,
-                  mode_t mode, uid_t uid, gid_t gid, struct stat *stbuf)
+int coroutine_fn v9fs_co_mkdir(V9fsPDU *pdu, V9fsFidState *fidp,
+                               V9fsString *name, mode_t mode, uid_t uid,
+                               gid_t gid, struct stat *stbuf)

 {
     int err;
     FsCred cred;
 {
     int err;
     FsCred cred;


@@ -118,7 +123,7 @@ int v9fs_co_mkdir(V9fsPDU *pdu, V9fsFidState *fidp, V9fsString *name,
     return err;
 }
 
     return err;
 }
 

-int v9fs_co_opendir(V9fsPDU *pdu, V9fsFidState *fidp)
+int coroutine_fn v9fs_co_opendir(V9fsPDU *pdu, V9fsFidState *fidp)

 {
     int err;
     V9fsState *s = pdu->s;
 {
     int err;
     V9fsState *s = pdu->s;


@@ -146,7 +151,7 @@ int v9fs_co_opendir(V9fsPDU *pdu, V9fsFidState *fidp)
     return err;
 }
 
     return err;
 }
 

-int v9fs_co_closedir(V9fsPDU *pdu, V9fsFidOpenState *fs)
+int coroutine_fn v9fs_co_closedir(V9fsPDU *pdu, V9fsFidOpenState *fs)

 {
     int err;
     V9fsState *s = pdu->s;
 {
     int err;
     V9fsState *s = pdu->s;