patchbot at xen
Apr 13, 2012, 9:33 AM
Post #1 of 1
(44 views)
Permalink
|
|
[xen-unstable] libxl: include <_libxl_paths.h> in libxl_internal.h
|
|
# HG changeset patch
# User Ian Jackson <ian.jackson [at] eu>
# Date 1334150056 -3600
# Node ID 8a99e1944bd09c690272cbda9eac346fcbdefde8
# Parent 6fc016d74c40c972f82c4da38e80b448713e4665
libxl: include <_libxl_paths.h> in libxl_internal.h
Ie, we permit general code in libxl direct access to the manifest
constants such as XEN_RUN_DIR. This simplifies their use in (eg)
format strings.
This might be controversial because it will make it difficult to make
any of these runtime-configurable later without changing lots of use
sites. But I don't think it's likely we'll want to do that.
For the moment, leave existing call sites of all the functions in
libxl_paths.c unchanged. The simplified use arrangements can be used
in new code and when we update call sites for other reasons.
Also correct the dependencies in the Makefile so that _libxl_paths.h
is generated before anything that uses libxl_internal.h.
Signed-off-by: Ian Jackson <ian.jackson [at] eu>
Acked-by: Ian Campbell <ian.campbell [at] citrix>
Signed-off-by: Roger Pau Monne <roger.pau [at] entel>
Committed-by: Ian Jackson <Ian.Jackson [at] eu>
---
diff -r 6fc016d74c40 -r 8a99e1944bd0 tools/libxl/Makefile
--- a/tools/libxl/Makefile Wed Apr 11 14:14:15 2012 +0100
+++ b/tools/libxl/Makefile Wed Apr 11 14:14:16 2012 +0100
@@ -102,11 +102,9 @@ _libxl_list.h: $(XEN_INCLUDE)/xen-extern
perl $^ --prefix=libxl >$@.new
$(call move-if-changed,$@.new,$@)
-libxl_paths.c: _libxl_paths.h
-
libxl.h: _libxl_types.h
libxl_json.h: _libxl_types_json.h
-libxl_internal.h: _libxl_types_internal.h
+libxl_internal.h: _libxl_types_internal.h _libxl_paths.h
libxl_internal_json.h: _libxl_types_internal_json.h
$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): libxl.h
diff -r 6fc016d74c40 -r 8a99e1944bd0 tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h Wed Apr 11 14:14:15 2012 +0100
+++ b/tools/libxl/libxl_internal.h Wed Apr 11 14:14:16 2012 +0100
@@ -51,6 +51,7 @@
#include <xen/io/xenbus.h>
#include "libxl.h"
+#include "_libxl_paths.h"
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
#define _hidden __attribute__((visibility("hidden")))
diff -r 6fc016d74c40 -r 8a99e1944bd0 tools/libxl/libxl_paths.c
--- a/tools/libxl/libxl_paths.c Wed Apr 11 14:14:15 2012 +0100
+++ b/tools/libxl/libxl_paths.c Wed Apr 11 14:14:16 2012 +0100
@@ -14,7 +14,6 @@
#include "libxl_osdeps.h" /* must come before any other headers */
#include "libxl_internal.h"
-#include "_libxl_paths.h"
const char *libxl_sbindir_path(void)
{
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
