Xen devel - Sep 2012 - [PATCH mini-os enhancements for vtpm 5/8] add CONFIG_XC to mini-os

This patch adds a CONFIG_XC option to mini-os, to allow conditional
support for libxc for mini-os domains.


Signed off by: Matthew Fioravante matthew.fioravante@jhuapl.edu

diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
--- a/extras/mini-os/Makefile
+++ b/extras/mini-os/Makefile
@@ -27,6 +27,7 @@ CONFIG_FBFRONT ?= y
 CONFIG_KBDFRONT ?= y
 CONFIG_CONSFRONT ?= y
 CONFIG_XENBUS ?= y
+CONFIG_XC ?=y
 CONFIG_LWIP ?= $(lwip)
 
 # Export config items as compiler directives
diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c
--- a/extras/mini-os/lib/sys.c
+++ b/extras/mini-os/lib/sys.c
@@ -397,6 +397,7 @@ int close(int fd)
         return res;
     }
 #endif
+#ifdef CONFIG_XC
     case FTYPE_XC:
         minios_interface_close_fd(fd);
         return 0;
@@ -406,6 +407,7 @@ int close(int fd)
     case FTYPE_GNTMAP:
         minios_gnttab_close_fd(fd);
         return 0;
+#endif
 #ifdef CONFIG_NETFRONT
     case FTYPE_TAP:
         shutdown_netfront(files[fd].tap.dev);
@@ -1195,10 +1197,13 @@ void *mmap(void *start, size_t length, int prot,
int flags, int fd, off_t offset
 
     if (fd == -1)
         return map_zero(n, 1);
+#ifdef CONFIG_XC
     else if (files[fd].type == FTYPE_XC) {
         unsigned long zero = 0;
         return map_frames_ex(&zero, n, 0, 0, 1, DOMID_SELF, NULL, 0);
-    } else if (files[fd].type == FTYPE_MEM) {
+    }
+#endif
+    else if (files[fd].type == FTYPE_MEM) {
         unsigned long first_mfn = offset >> PAGE_SHIFT;
         return map_frames_ex(&first_mfn, n, 0, 1, 1, DOMID_IO, NULL,
_PAGE_PRESENT|_PAGE_RW);
     } else ASSERT(0);
-- 
1.7.4.4




_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Matthew Fioravante, le Mon 17 Sep 2012 18:00:31 -0400, a écrit
:
> diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
> --- a/extras/mini-os/Makefile
> +++ b/extras/mini-os/Makefile
> @@ -27,6 +27,7 @@ CONFIG_FBFRONT ?= y
>  CONFIG_KBDFRONT ?= y
>  CONFIG_CONSFRONT ?= y
>  CONFIG_XENBUS ?= y
> +CONFIG_XC ?=y
>  CONFIG_LWIP ?= $(lwip)
>  
>  # Export config items as compiler directives
Maybe it''d be safer to also disable 

APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(XEN_TARGET_ARCH) -whole-archive
-lxenguest -lxenctrl -no-whole-archive

in that case?

Apart from that,

Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Samuel