Commit 58a864de authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents b9f84ac0 ecbe251f

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -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

configure

+4 −1
Original line number Diff line number Diff line
@@ -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

include/qom/object.h

+1 −1
Original line number Diff line number Diff line
@@ -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:

qom/object.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {