diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-15 16:53:10 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-15 16:53:10 -0600 |
| commit | 58a864dec23f9052a5379a3ce81566e065c14afa (patch) | |
| tree | 8fc11aa19816f0089a0bb9e58346a1566c84c1e6 | |
| parent | b9f84ac0fa81315bf4efa8db64f0705273b7499a (diff) | |
| parent | ecbe251fa0eb4905c4a82c887e37057243b9fbad (diff) | |
| download | qemu-58a864dec23f9052a5379a3ce81566e065c14afa.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
configure: try pkg-config for curses
qom: Make object_resolve_path_component() path argument const
Add libcacard/trace/generated-tracers.c to .gitignore
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | include/qom/object.h | 2 | ||||
| -rw-r--r-- | qom/object.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 5fea65dc14..53fe9c3078 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ trace/generated-tracers.h trace/generated-tracers.c trace/generated-tracers-dtrace.h trace/generated-tracers-dtrace.dtrace +libcacard/trace/generated-tracers.c *-timestamp *-softmmu *-darwin-user @@ -2039,7 +2039,7 @@ fi if test "$mingw32" = "yes" ; then curses_list="-lpdcurses" else - curses_list="-lncurses -lcurses" + curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses)" fi if test "$curses" != "no" ; then @@ -2052,13 +2052,16 @@ int main(void) { return s != 0; } EOF + IFS=: for curses_lib in $curses_list; do + unset IFS if compile_prog "" "$curses_lib" ; then curses_found=yes libs_softmmu="$curses_lib $libs_softmmu" break fi done + unset IFS if test "$curses_found" = "yes" ; then curses=yes else diff --git a/include/qom/object.h b/include/qom/object.h index d43b289a40..1ef2f0edd4 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -900,7 +900,7 @@ Object *object_resolve_path_type(const char *path, const char *typename, * * Returns: The resolved object or NULL on path lookup failure. */ -Object *object_resolve_path_component(Object *parent, gchar *part); +Object *object_resolve_path_component(Object *parent, const gchar *part); /** * object_property_add_child: diff --git a/qom/object.c b/qom/object.c index 351b88c817..03e6f24d28 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1017,7 +1017,7 @@ gchar *object_get_canonical_path(Object *obj) return newpath; } -Object *object_resolve_path_component(Object *parent, gchar *part) +Object *object_resolve_path_component(Object *parent, const gchar *part) { ObjectProperty *prop = object_property_find(parent, part, NULL); if (prop == NULL) { |