move dprintf to common librumprun_rumpuser

diff --git a/lib/librumprun_rumpuser/Makefile b/lib/librumprun_rumpuser/Makefile
index b98348e87dd4b32f984fb7b08e6a1d612e69806c..0231f4e9349360a739819be17078387fff4bbb5e 100644 (file)
--- a/lib/librumprun_rumpuser/Makefile
+++ b/lib/librumprun_rumpuser/Makefile
@@ -3,6 +3,7 @@ LIBISPRIVATE=   # defined
 
 SRCS=          rumpuser_base.c
 SRCS+=         rumpuser_clock.c
+SRCS+=         rumpuser_dprintf.c
 SRCS+=         rumpuser_mem.c
 SRCS+=         rumpuser_synch.c
 

diff --git a/lib/librumprun_rumpuser/rumpuser_dprintf.c b/lib/librumprun_rumpuser/rumpuser_dprintf.c
new file mode 100644 (file)
index 0000000..81bf495
--- /dev/null
+++ b/lib/librumprun_rumpuser/rumpuser_dprintf.c
@@ -0,0 +1,41 @@
+/*-
+ * Copyright (c) 2015 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#define _BMK_PRINTF_VA
+
+#include <bmk-core/printf.h>
+
+#include <bmk-rumpuser/core_types.h>
+#include <bmk-rumpuser/rumpuser.h>
+
+void
+rumpuser_dprintf(const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       bmk_vprintf(fmt, ap);
+       va_end(ap);
+}

diff --git a/platform/baremetal/rumpuser.c b/platform/baremetal/rumpuser.c
index 56f54a4fca9649eee3f78fa49741e93a983fa729..aab6b244f5ef0998afb48f4d70a8b1830d6447e0 100644 (file)
--- a/platform/baremetal/rumpuser.c
+++ b/platform/baremetal/rumpuser.c
@@ -117,13 +117,3 @@ rumpuser_getrandom(void *buf, size_t buflen, int flags, size_t *retp)
        }
        return 0;
 }
-
-/*
- * currently, supports only printing fmt.  better than nothing ...
- */
-void
-rumpuser_dprintf(const char *fmt, ...)
-{
-
-       bmk_cons_puts(fmt);
-}

diff --git a/platform/xen/rumphyper_base.c b/platform/xen/rumphyper_base.c
index 62bd57e286cce2330f2c18da0394c5f221eb8cb1..8436e64f1438cd328a76ade59964607e514d6f34 100644 (file)
--- a/platform/xen/rumphyper_base.c
+++ b/platform/xen/rumphyper_base.c
@@ -46,24 +46,6 @@ rumpuser_putchar(int ch)
        minios_console_print(NULL, &c, 1);
 }
 
-void
-rumpuser_dprintf(const char *fmt, ...)
-{
-       char *buf;
-       va_list va;
-
-       buf = (void *)minios_alloc_pages(0);
-       if (!buf)
-               return;
-
-       va_start(va, fmt);
-       vsnprintf(buf, PAGE_SIZE, fmt, va);
-       va_end(va);
-       minios_console_print(NULL, buf, bmk_strlen(buf));
-
-       minios_free_pages(buf, 0);
-}
-
 int
 rumpuser_getparam(const char *name, void *buf, size_t buflen)
 {