Merge remote-tracking branch 'qmp/for-anthony' into staging

diff --combined Makefile.objs
index a82974bf9a33acd257343493fae57f0f6484c78c,52ad77ba91fb49ea7ac630419ecbe142260c5794..6991a9f52acce561eb4c4bba236f69ca2d00a666
--- 1/Makefile.objs
--- 2/Makefile.objs
+++ b/Makefile.objs
@@@ -205,7 -205,6 +205,7 @@@ hw-obj-$(CONFIG_HPET) += hpet.
  hw-obj-$(CONFIG_APPLESMC) += applesmc.o
  hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o
  hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
 +hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o
  
  # PPC devices
  hw-obj-$(CONFIG_OPENPIC) += openpic.o
@@@ -373,7 -372,15 +373,15 @@@ endi
  
  libcacard-y = cac.o event.o vcard.o vreader.o vcard_emul_nss.o vcard_emul_type.o card_7816.o
  
+ ######################################################################
+ # qapi
+ 
+ qapi-nested-y = qapi-visit-core.o qmp-input-visitor.o qmp-output-visitor.o qapi-dealloc-visitor.o
+ qapi-nested-y += qmp-registry.o qmp-dispatch.o
+ qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y))
+ 
  vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
  
  vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
  
+ vl.o: QEMU_CFLAGS+=$(GLIB_CFLAGS)

diff --combined configure
index 3a76bb8b4bb611975eb453579e05b9e07239e351,f9be70993a553ff672d71221a0761ef58ddc0f31..6911c3be6aed127c412abdea79171ffb53c3380d
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -177,7 -177,6 +177,7 @@@ spice="
  rbd=""
  smartcard=""
  smartcard_nss=""
 +usb_redir=""
  opengl=""
  
  # parse CC options first
@@@ -744,10 -743,6 +744,10 @@@ for opt d
    ;;
    --enable-smartcard-nss) smartcard_nss="yes"
    ;;
 +  --disable-usb-redir) usb_redir="no"
 +  ;;
 +  --enable-usb-redir) usb_redir="yes"
 +  ;;
    *) echo "ERROR: unknown option $opt"; show_help="yes"
    ;;
    esac
@@@ -1023,8 -1018,6 +1023,8 @@@ echo "  --disable-smartcard      disabl
  echo "  --enable-smartcard       enable smartcard support"
  echo "  --disable-smartcard-nss  disable smartcard nss support"
  echo "  --enable-smartcard-nss   enable smartcard nss support"
 +echo "  --disable-usb-redir      disable usb network redirection support"
 +echo "  --enable-usb-redir       enable usb network redirection support"
  echo ""
  echo "NOTE: The object files are built at the place where configure is launched"
  exit 1
@@@ -1809,6 -1802,18 +1809,18 @@@ EO
    fi
  fi
  
+ ##########################################
+ # glib support probe
+ if $pkg_config --modversion gthread-2.0 gio-2.0 > /dev/null 2>&1 ; then
+     glib_cflags=`$pkg_config --cflags gthread-2.0 gio-2.0 2>/dev/null`
+     glib_libs=`$pkg_config --libs gthread-2.0 gio-2.0 2>/dev/null`
+     libs_softmmu="$glib_libs $libs_softmmu"
+     libs_tools="$glib_libs $libs_tools"
+ else
+     echo "glib-2.0 required to compile QEMU"
+     exit 1
+ fi
+ 
  ##########################################
  # pthread probe
  PTHREADLIBS_LIST="-lpthread -lpthreadGC2"
@@@ -2378,22 -2383,6 +2390,22 @@@ if test "$smartcard" = "no" ; the
      smartcard_nss="no"
  fi
  
 +# check for usbredirparser for usb network redirection support
 +if test "$usb_redir" != "no" ; then
 +    if $pkg_config libusbredirparser >/dev/null 2>&1 ; then
 +        usb_redir="yes"
 +        usb_redir_cflags=$($pkg_config --cflags libusbredirparser 2>/dev/null)
 +        usb_redir_libs=$($pkg_config --libs libusbredirparser 2>/dev/null)
 +        QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"
 +        LIBS="$LIBS $usb_redir_libs"
 +    else
 +        if test "$usb_redir" = "yes"; then
 +            feature_not_found "usb-redir"
 +        fi
 +        usb_redir="no"
 +    fi
 +fi
 +
  ##########################################
  
  ##########################################
@@@ -2543,6 -2532,7 +2555,7 @@@ if test "$softmmu" = yes ; the
    tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
    if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
        tools="qemu-nbd\$(EXESUF) $tools"
+       tools="qemu-ga\$(EXESUF) $tools"
      if [ "$check_utests" = "yes" ]; then
        tools="check-qint check-qstring check-qdict check-qlist $tools"
        tools="check-qfloat check-qjson $tools"
@@@ -2640,7 -2630,6 +2653,7 @@@ echo "spice support     $spice
  echo "rbd support       $rbd"
  echo "xfsctl support    $xfs"
  echo "nss used          $smartcard_nss"
 +echo "usb net redir     $usb_redir"
  echo "OpenGL support    $opengl"
  
  if test $sdl_too_old = "yes"; then
@@@ -2873,6 -2862,7 +2886,7 @@@ if test "$bluez" = "yes" ; the
    echo "CONFIG_BLUEZ=y" >> $config_host_mak
    echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
  fi
+ echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
  if test "$xen" = "yes" ; then
    echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
    echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >> $config_host_mak
@@@ -2934,10 -2924,6 +2948,10 @@@ if test "$smartcard_nss" = "yes" ; the
    echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
  fi
  
 +if test "$usb_redir" = "yes" ; then
 +  echo "CONFIG_USB_REDIR=y" >> $config_host_mak
 +fi
 +
  if test "$opengl" = "yes" ; then
    echo "CONFIG_OPENGL=y" >> $config_host_mak
  fi
@@@ -3501,6 -3487,8 +3515,8 @@@ DIRS="tests tests/cris slirp audio bloc
  DIRS="$DIRS pc-bios/spapr-rtas"
  DIRS="$DIRS roms/seabios roms/vgabios"
  DIRS="$DIRS fsdev ui"
+ DIRS="$DIRS qapi"
+ DIRS="$DIRS qga"
  FILES="Makefile tests/Makefile"
  FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
  FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"