Merge commit 'd7f9b68971d5f9111afeae03c61199346b868c13' into upstream-merge

* commit 'd7f9b68971d5f9111afeae03c61199346b868c13': (25 commits)
  monitor: Convert mon_cmd_t initializations to C99 style
  Introduce QList unit-tests
  Introduce QList
  QObject: Accept NULL
  Only compile ssi when one target uses it
  Only compile ssi-sd when one target uses it
  Only compile max111x when one target uses it
  Only compile ads7846 when one target uses it
  Only compile sd0323 when one target uses it
  Only compile sd0303 when one target uses it
  Only compile stellaris_input when one target uses it
  Only compile tmp105 when one target uses it
  Only compile lm832x when one target uses it
  Only compile tsc2005 when one target uses it
  Only compile twl92230 when one target uses it
  Only compile wm8750 when one target uses it
  Only compile max7310 when one target uses it
  Only compile sd when one target uses it
  Only compile ptimer when one target uses it
  Only compile m48t59 when one target uses it
  ...

Conflicts:
	qemu-monitor.hx

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index f40596cdc..84a95a81b 100755
--- a/configure
+++ b/configure
@@ -2178,7 +2178,7 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
   if [ "$linux" = "yes" ] ; then
       tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools"
     if [ "$check_utests" = "yes" ]; then
-      tools="check-qint check-qstring check-qdict $tools"
+      tools="check-qint check-qstring check-qdict check-qlist $tools"
     fi
   elif test "$mingw32" = "yes" ; then
       tools="qemu-io\$(EXESUF) $tools"