Merge commit '1945120112e93aa96af6d6004b36599f783ac563' into upstream-merge

* commit '1945120112e93aa96af6d6004b36599f783ac563':
  Update SeaBIOS to latest
  Add test suite for json marshalling
  Provide marshalling mechanism for json
  QDict: Introduce qdict_iter()
  Add a unit test for JSON support
  Add a QObject JSON wrapper
  Add a JSON parser
  Add a JSON message boundary identifier
  Add a lexer for JSON
  Add a QBool type
  Add unit test for QFloat
  Add a QFloat datatype
  Allow strings to grow in size
  Add operations to qlist to allow it to be used as a stack
  Properly escape QDECREF macro arguments
  Cleanup configure checks for dup3 and fallocate

Conflicts:
	pc-bios/bios.bin (pick qemu-kvm)

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/configure b/configure
index 1948ae958..a3687f964 100755
--- a/configure
+++ b/configure
@@ -1723,7 +1723,7 @@ int main(void)
     return 0;
 }
 EOF
-if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
+if compile_prog "" "" ; then
   fallocate=yes
 fi
 
@@ -1738,7 +1738,7 @@ int main(void)
     return 0;
 }
 EOF
-if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
+if compile_prog "" "" ; then
   dup3=yes
 fi
 
@@ -2258,6 +2258,7 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
       tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools"
     if [ "$check_utests" = "yes" ]; then
       tools="check-qint check-qstring check-qdict check-qlist $tools"
+      tools="check-qfloat check-qjson $tools"
     fi
   elif test "$mingw32" = "yes" ; then
       tools="qemu-io\$(EXESUF) $tools"