Commit f69f0bca authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mdroth/qga-pull-2013-9-9' into staging 



# By Tomoki Sekiyama (10) and Paul Burton (1)
# Via Michael Roth
* mdroth/qga-pull-2013-9-9:
  QMP/qemu-ga-client: Make timeout longer for guest-fsfreeze-freeze command
  qemu-ga: Install Windows VSS provider on `qemu-ga -s install'
  qemu-ga: Call Windows VSS requester in fsfreeze command handler
  qemu-ga: Add Windows VSS provider and requester as DLL
  error: Add error_set_win32 and error_setg_win32
  qemu-ga: Add configure options to specify path to Windows/VSS SDK
  Add a script to extract VSS SDK headers on POSIX system
  checkpatch.pl: Check .cpp files
  Add c++ keywords to QAPI helper script
  configure: Support configuring C++ compiler
  mips_malta: support up to 2GiB RAM

Message-id: 1378755701-2051-1-git-send-email-mdroth@linux.vnet.ibm.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents 97fdb941 e2682db0

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ fsdev/virtfs-proxy-helper.pod 
*.la

*.pc

.libs

.sdk

*.swp

*.orig

.pc

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ clean: 
	rm -f qemu-options.def

	find . -name '*.[oda]' -type f -exec rm -f {} +

	find . -name '*.l[oa]' -type f -exec rm -f {} +

	rm -f $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~

	rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~

	rm -Rf .libs

	rm -f qemu-img-cmds.h

	@# May not be present in GENERATED_HEADERS
@@ -272,6 +272,7 @@ distclean: clean 
	for d in $(TARGET_DIRS); do \

	rm -rf $$d || exit 1 ; \

        done

	rm -Rf .sdk

	if test -f pixman/config.log; then make -C pixman distclean; fi

	if test -f dtc/version_gen.h; then make $(DTC_MAKE_ARGS) clean; fi

Makefile.objs

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo 
# FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed

# by libqemuutil.a.  These should be moved to a separate .json schema.

qga-obj-y = qga/ qapi-types.o qapi-visit.o

qga-vss-dll-obj-y = qga/



vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
@@ -120,6 +121,7 @@ nested-vars += \ 
	stub-obj-y \

	util-obj-y \

	qga-obj-y \

	qga-vss-dll-obj-y \

	block-obj-y \

	common-obj-y

dummy := $(call unnest-vars)

QMP/qemu-ga-client

+3 −1
Original line number Diff line number Diff line
@@ -267,7 +267,9 @@ def main(address, cmd, args): 
            print('Hint: qemu is not running?')

        sys.exit(1)



    if cmd != 'ping':

    if cmd == 'fsfreeze' and args[0] == 'freeze':

        client.sync(60)

    elif cmd != 'ping':

        client.sync()



    globals()['_cmd_' + cmd](client, args)

configure

+95 −1
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ usb_redir="" 
glx=""

zlib="yes"

guest_agent=""

guest_agent_with_vss="no"

vss_win32_sdk=""

win_sdk="no"

want_tools="yes"

libiscsi=""

coroutine=""
@@ -252,6 +255,8 @@ for opt do 
  ;;

  --cc=*) CC="$optarg"

  ;;

  --cxx=*) CXX="$optarg"

  ;;

  --source-path=*) source_path="$optarg"

  ;;

  --cpu=*) cpu="$optarg"
@@ -282,6 +287,12 @@ else 
  cc="${CC-${cross_prefix}gcc}"

fi



if test -z "${CXX}${cross_prefix}"; then

  cxx="c++"

else

  cxx="${CXX-${cross_prefix}g++}"

fi



ar="${AR-${cross_prefix}ar}"

as="${AS-${cross_prefix}as}"

cpp="${CPP-$cc -E}"
@@ -626,6 +637,8 @@ for opt do 
  ;;

  --host-cc=*) host_cc="$optarg"

  ;;

  --cxx=*)

  ;;

  --objcc=*) objcc="$optarg"

  ;;

  --make=*) make="$optarg"
@@ -917,6 +930,18 @@ for opt do 
  ;;

  --disable-guest-agent) guest_agent="no"

  ;;

  --with-vss-sdk) vss_win32_sdk=""

  ;;

  --with-vss-sdk=*) vss_win32_sdk="$optarg"

  ;;

  --without-vss-sdk) vss_win32_sdk="no"

  ;;

  --with-win-sdk) win_sdk=""

  ;;

  --with-win-sdk=*) win_sdk="$optarg"

  ;;

  --without-win-sdk) win_sdk="no"

  ;;

  --enable-tools) want_tools="yes"

  ;;

  --disable-tools) want_tools="no"
@@ -1032,6 +1057,7 @@ echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]" 
echo "  --cc=CC                  use C compiler CC [$cc]"

echo "  --host-cc=CC             use C compiler CC [$host_cc] for code run at"

echo "                           build time"

echo "  --cxx=CXX                use C++ compiler CXX [$cxx]"

echo "  --objcc=OBJCC            use Objective-C compiler OBJCC [$objcc]"

echo "  --extra-cflags=CFLAGS    append extra C compiler flags QEMU_CFLAGS"

echo "  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS"
@@ -1157,6 +1183,8 @@ echo " --disable-usb-redir disable usb network redirection support" 
echo "  --enable-usb-redir       enable usb network redirection support"

echo "  --disable-guest-agent    disable building of the QEMU Guest Agent"

echo "  --enable-guest-agent     enable building of the QEMU Guest Agent"

echo "  --with-vss-sdk=SDK-path  enable Windows VSS support in QEMU Guest Agent"

echo "  --with-win-sdk=SDK-path  path to Windows Platform SDK (to build VSS .tlb)"

echo "  --disable-seccomp        disable seccomp support"

echo "  --enable-seccomp         enables seccomp support"

echo "  --with-coroutine=BACKEND coroutine backend. Supported options:"
@@ -3120,6 +3148,61 @@ if test "$usb_redir" != "no" ; then 
    fi

fi



##########################################

# check if we have VSS SDK headers for win



if test "$mingw32" = "yes" -a "$guest_agent" != "no" -a "$vss_win32_sdk" != "no" ; then

  case "$vss_win32_sdk" in

    "")   vss_win32_include="-I$source_path" ;;

    *\ *) # The SDK is installed in "Program Files" by default, but we cannot

          # handle path with spaces. So we symlink the headers into ".sdk/vss".

          vss_win32_include="-I$source_path/.sdk/vss"

	  symlink "$vss_win32_sdk/inc" "$source_path/.sdk/vss/inc"

	  ;;

    *)    vss_win32_include="-I$vss_win32_sdk"

  esac

  cat > $TMPC << EOF

#define __MIDL_user_allocate_free_DEFINED__

#include <inc/win2003/vss.h>

int main(void) { return VSS_CTX_BACKUP; }

EOF

  if compile_prog "$vss_win32_include" "" ; then

    guest_agent_with_vss="yes"

    QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"

    libs_qga="-lole32 -loleaut32 -lshlwapi -luuid -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"

  else

    if test "$vss_win32_sdk" != "" ; then

      echo "ERROR: Please download and install Microsoft VSS SDK:"

      echo "ERROR:   http://www.microsoft.com/en-us/download/details.aspx?id=23490"

      echo "ERROR: On POSIX-systems, you can extract the SDK headers by:"

      echo "ERROR:   scripts/extract-vsssdk-headers setup.exe"

      echo "ERROR: The headers are extracted in the directory \`inc'."

      feature_not_found "VSS support"

    fi

    guest_agent_with_vss="no"

  fi

fi



##########################################

# lookup Windows platform SDK (if not specified)

# The SDK is needed only to build .tlb (type library) file of guest agent

# VSS provider from the source. It is usually unnecessary because the

# pre-compiled .tlb file is included.



if test "$mingw32" = "yes" -a "$guest_agent" != "no" -a "$guest_agent_with_vss" = "yes" ; then

  if test -z "$win_sdk"; then

    programfiles="$PROGRAMFILES"

    test -n "$PROGRAMW6432" && programfiles="$PROGRAMW6432"

    if test -n "$programfiles"; then

      win_sdk=$(ls -d "$programfiles/Microsoft SDKs/Windows/v"* | tail -1) 2>/dev/null

    else

      feature_not_found "Windows SDK"

    fi

  elif test "$win_sdk" = "no"; then

    win_sdk=""

  fi

fi



##########################################



##########################################
@@ -3485,8 +3568,11 @@ if test "$softmmu" = yes ; then 
  fi

fi

if [ "$guest_agent" != "no" ]; then

  if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then

  if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then

      tools="qemu-ga\$(EXESUF) $tools"

      if [ "$mingw32" = "yes" -a "$guest_agent_with_vss" = "yes" ]; then

        tools="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb $tools"

      fi

      guest_agent=yes

  elif [ "$guest_agent" != yes ]; then

      guest_agent=no
@@ -3557,10 +3643,12 @@ echo "Manual directory `eval echo $mandir`" 
echo "ELF interp prefix $interp_prefix"

else

echo "local state directory   queried at runtime"

echo "Windows SDK       $win_sdk"

fi

echo "Source path       $source_path"

echo "C compiler        $cc"

echo "Host C compiler   $host_cc"

echo "C++ compiler      $cxx"

echo "Objective-C compiler $objcc"

echo "CFLAGS            $CFLAGS"

echo "QEMU_CFLAGS       $QEMU_CFLAGS"
@@ -3642,6 +3730,7 @@ echo "usb net redir $usb_redir" 
echo "GLX support       $glx"

echo "libiscsi support  $libiscsi"

echo "build guest agent $guest_agent"

echo "QGA VSS support   $guest_agent_with_vss"

echo "seccomp support   $seccomp"

echo "coroutine backend $coroutine"

echo "GlusterFS support $glusterfs"
@@ -3716,6 +3805,10 @@ if test "$mingw32" = "yes" ; then 
  version_micro=0

  echo "CONFIG_FILEVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak

  echo "CONFIG_PRODUCTVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak

  if test "$guest_agent_with_vss" = "yes" ; then

    echo "CONFIG_QGA_VSS=y" >> $config_host_mak

    echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak

  fi

else

  echo "CONFIG_POSIX=y" >> $config_host_mak

fi
@@ -4148,6 +4241,7 @@ echo "PYTHON=$python" >> $config_host_mak 
echo "CC=$cc" >> $config_host_mak

echo "CC_I386=$cc_i386" >> $config_host_mak

echo "HOST_CC=$host_cc" >> $config_host_mak

echo "CXX=$cxx" >> $config_host_mak

echo "OBJCC=$objcc" >> $config_host_mak

echo "AR=$ar" >> $config_host_mak

echo "AS=$as" >> $config_host_mak