motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-08 16:07:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Browse source 
* 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>
This commit is contained in:
Anthony Liguori 2013-01-15 16:53:10 -06:00
commit 58a864dec2
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -7,6 +7,7 @@ trace/generated-tracers.h
trace/generated-tracers.c trace/generated-tracers.c
trace/generated-tracers-dtrace.h trace/generated-tracers-dtrace.h
trace/generated-tracers-dtrace.dtrace trace/generated-tracers-dtrace.dtrace
libcacard/trace/generated-tracers.c
*-timestamp *-timestamp
*-softmmu *-softmmu
*-darwin-user *-darwin-user

5
configure vendored
View file

@ -2039,7 +2039,7 @@ fi
if test "$mingw32" = "yes" ; then if test "$mingw32" = "yes" ; then
curses_list="-lpdcurses" curses_list="-lpdcurses"
else else
curses_list="-lncurses -lcurses" curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses)"
fi fi
if test "$curses" != "no" ; then if test "$curses" != "no" ; then
@ -2052,13 +2052,16 @@ int main(void) {
return s != 0; return s != 0;
} }
EOF EOF
IFS=:
for curses_lib in $curses_list; do for curses_lib in $curses_list; do
unset IFS
if compile_prog "" "$curses_lib" ; then if compile_prog "" "$curses_lib" ; then
curses_found=yes curses_found=yes
libs_softmmu="$curses_lib $libs_softmmu" libs_softmmu="$curses_lib $libs_softmmu"
break break
fi fi
done done
unset IFS
if test "$curses_found" = "yes" ; then if test "$curses_found" = "yes" ; then
curses=yes curses=yes
else else

2
include/qom/object.h
View file

@ -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. * 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: * object_property_add_child:

2
qom/object.c
View file

@ -1017,7 +1017,7 @@ gchar *object_get_canonical_path(Object *obj)
return newpath; 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); ObjectProperty *prop = object_property_find(parent, part, NULL);
if (prop == NULL) { if (prop == NULL) {