Get rid of uses of rumpdefs.h

(wasn't wrong, but can be unnecessarily confusing to people
reading the sources)

diff --git a/rumphyper.h b/rumphyper.h
index 1f19a4b15848e827496cd0ef40d08e1e3a3d8d99..872d403b14b67e9b0054f7634a9018f882249755 100644 (file)
--- a/rumphyper.h
+++ b/rumphyper.h
@@ -30,7 +30,6 @@
 #define LIBRUMPUSER
 
 #include <rump/rumpuser.h>
-#include <rump/rumpdefs.h>
 
 extern struct rumpuser_hyperup rumpuser__hyp;
 

diff --git a/rumphyper_base.c b/rumphyper_base.c
index a3813c52a85e560e882e32a8f1ba8b31a118bdff..f78157c993d107d5734692a6406d6392e89cb7a6 100644 (file)
--- a/rumphyper_base.c
+++ b/rumphyper_base.c
@@ -31,6 +31,7 @@
 #include <mini-os/blkfront.h>
 #include <mini-os/fcntl.h>
 
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -79,7 +80,7 @@ rumpuser_getparam(const char *name, void *buf, size_t blen)
        for (i = 0; envtab[i].name; i++) {
                if (strcmp(name, envtab[i].name) == 0) {
                        if (blen < strlen(envtab[i].value)+1) {
-                               return RUMP_E2BIG;
+                               return E2BIG;
                        } else {
                                strcpy(buf, envtab[i].value);
                                return 0;
@@ -87,7 +88,7 @@ rumpuser_getparam(const char *name, void *buf, size_t blen)
                }
        }
 
-        return RUMP_ENOENT;
+        return ENOENT;
 }
 
 /* Use same values both for absolute and relative clock. */
@@ -158,7 +159,7 @@ rumpuser_malloc(size_t len, int alignment, void **retval)
        if (*retval)
                return 0;
        else
-               return RUMP_ENOMEM;
+               return ENOMEM;
 }
 
 void
@@ -220,7 +221,7 @@ devopen(int num)
                blkopen[num] = 1;
                return 0;
        } else {
-               return RUMP_EIO; /* guess something */
+               return EIO; /* guess something */
        }
 }
 
@@ -248,7 +249,7 @@ rumpuser_open(const char *name, int mode, int *fdp)
        int acc, rv, num;
 
        if ((mode & RUMPUSER_OPEN_BIO) == 0 || (num = devname2num(name)) == -1)
-               return RUMP_ENXIO;
+               return ENXIO;
 
        if ((rv = devopen(num)) != 0)
                return rv;
@@ -257,7 +258,7 @@ rumpuser_open(const char *name, int mode, int *fdp)
        if (acc == RUMPUSER_OPEN_WRONLY || acc == RUMPUSER_OPEN_RDWR) {
                if (blkinfos[num].mode != O_RDWR) {
                        /* XXX: unopen */
-                       return RUMP_EROFS;
+                       return EROFS;
                }
        }
 
@@ -271,7 +272,7 @@ rumpuser_close(int fd)
        int rfd = fd - BLKFDOFF;
 
        if (rfd < 0 || rfd+1 > NBLKDEV)
-               return RUMP_EBADF;
+               return EBADF;
 
        if (--blkopen[rfd] == 0) {
                struct blkfront_dev *toclose = blkdevs[rfd];
@@ -290,7 +291,7 @@ rumpuser_getfileinfo(const char *name, uint64_t *size, int *type)
        int rv, num;
 
        if ((num = devname2num(name)) == -1)
-               return RUMP_ENXIO;
+               return ENXIO;
        if ((rv = devopen(num)) != 0)
                return rv;
 
@@ -317,7 +318,7 @@ biocomp(struct blkfront_aiocb *aiocb, int ret)
 
        rumpkern_sched(0, NULL);
        if (ret)
-               bio->bio_done(bio->bio_arg, 0, RUMP_EIO);
+               bio->bio_done(bio->bio_arg, 0, EIO);
        else
                bio->bio_done(bio->bio_arg, bio->bio_aiocb.aio_nbytes, 0);
        rumpkern_unsched(&dummy, NULL);

diff --git a/rumphyper_net.c b/rumphyper_net.c
index c874c35946dd53fc7e03fb615a2ad444b1bb5cd0..bc61906171e889d8c80e6b88384bbbb0d8f45f81 100644 (file)
--- a/rumphyper_net.c
+++ b/rumphyper_net.c
@@ -23,24 +23,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/uio.h>
+
 #include <mini-os/os.h>
 #include <mini-os/netfront.h>
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "rumphyper.h"
 #include <rump/rumpuser.h>
-#include <rump/rumpdefs.h>
-
-/*
- * minios doesn't give us iovec, so just define it here since it's
- * pretty much guaranteed to remain static for all eternity
- */
-struct iovec {
-       void *iov_base;
-       size_t iov_len;
-};
 
 #include <rumpxenif/if_virt.h>
 #include <rumpxenif/if_virt_user.h>
@@ -153,7 +146,7 @@ VIFHYPER_CREATE(int devnum, struct virtif_sc *vif_sc, uint8_t *enaddr,
 
        viu = malloc(sizeof(*viu));
        if (viu == NULL) {
-               rv = RUMP_ENOMEM;
+               rv = ENOMEM;
                goto out;
        }
        memset(viu, 0, sizeof(*viu));
@@ -161,7 +154,7 @@ VIFHYPER_CREATE(int devnum, struct virtif_sc *vif_sc, uint8_t *enaddr,
 
        viu->viu_dev = init_netfront(NULL, myrecv, enaddr, NULL, viu);
        if (!viu->viu_dev) {
-               rv = RUMP_EINVAL; /* ? */
+               rv = EINVAL; /* ? */
                free(viu);
                goto out;
        }

diff --git a/rumphyper_synch.c b/rumphyper_synch.c
index ed84a5e4ba974ca16a256075861ac73804a13828..d58908dd6d39e6dbb7f6a9352c6fd8b6b1eb01b0 100644 (file)
--- a/rumphyper_synch.c
+++ b/rumphyper_synch.c
@@ -30,12 +30,13 @@
  * anything fancy.
  */
 
+#include <sys/queue.h>
+
 #include <mini-os/types.h>
 #include <mini-os/console.h>
 #include <mini-os/sched.h>
 
-#include <sys/queue.h>
-
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -67,7 +68,7 @@ wait(struct waithead *wh, uint64_t nsec)
        if (w.onlist)
                TAILQ_REMOVE(wh, &w, entries);
 
-       return w.onlist ? RUMP_ETIMEDOUT : 0;
+       return w.onlist ? ETIMEDOUT : 0;
 }
 
 static void
@@ -104,7 +105,7 @@ rumpuser_thread_create(void *(*f)(void *), void *arg, const char *thrname,
        *tptr = create_thread(thrname, (void (*)(void *))f, arg);
        rumpkern_sched(nlocks, NULL);
 
-       return *tptr ? 0 : RUMP_EINVAL;
+       return *tptr ? 0 : EINVAL;
 }
 
 void
@@ -174,7 +175,7 @@ rumpuser_mutex_tryenter(struct rumpuser_mtx *mtx)
        struct lwp *l = get_current()->lwp;
 
        if (mtx->v && mtx->o != l)
-               return RUMP_EBUSY;
+               return EBUSY;
 
        mtx->v++;
        mtx->o = l;
@@ -264,7 +265,7 @@ rumpuser_rw_tryenter(int enum_rumprwlock, struct rumpuser_rw *rw)
                        rw->o = rumpuser_curlwp();
                        rv = 0;
                } else {
-                       rv = RUMP_EBUSY;
+                       rv = EBUSY;
                }
                break;
        case RUMPUSER_RW_READER:
@@ -272,7 +273,7 @@ rumpuser_rw_tryenter(int enum_rumprwlock, struct rumpuser_rw *rw)
                        rw->v++;
                        rv = 0;
                } else {
-                       rv = RUMP_EBUSY;
+                       rv = EBUSY;
                }
                break;
        }
@@ -339,7 +340,7 @@ rumpuser_rw_tryupgrade(struct rumpuser_rw *rw)
                return 0;
        }
 
-       return RUMP_EBUSY;
+       return EBUSY;
 }
 
 struct rumpuser_cv {