Commit 05a6f451 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2017-03-30-tag' into staging 



qemu-ga patch queue for 2.9

* fix make check failure of guest-get-fsinfo when nested virtual block
  device partitions are mounted in the test environment
* fix static compilation for mingw builds

# gpg: Signature made Fri 31 Mar 2017 04:52:40 BST
# gpg:                using RSA key 0x3353C9CEF108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D  3FA0 3353 C9CE F108 B584

* remotes/mdroth/tags/qga-pull-2017-03-30-tag:
  qga: Make qemu-ga compile statically for Windows
  qga: don't fail if mount doesn't have slave devices

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a0ee3797 4eaf7202

configure

+7 −0
Original line number Diff line number Diff line
@@ -3078,6 +3078,13 @@ if test "$modules" = yes; then 
    glib_modules="$glib_modules gmodule-2.0"

fi



# This workaround is required due to a bug in pkg-config file for glib as it

# doesn't define GLIB_STATIC_COMPILATION for pkg-config --static



if test "$static" = yes -a "$mingw32" = yes; then

    QEMU_CFLAGS="-DGLIB_STATIC_COMPILATION $QEMU_CFLAGS"

fi



for i in $glib_modules; do

    if $pkg_config --atleast-version=$glib_req_ver $i; then

        glib_cflags=$($pkg_config --cflags $i)

qga/commands-posix.c

+3 −1
Original line number Diff line number Diff line
@@ -999,7 +999,9 @@ static void build_guest_fsinfo_for_virtual_device(char const *syspath, 
    dirpath = g_strdup_printf("%s/slaves", syspath);

    dir = opendir(dirpath);

    if (!dir) {

        if (errno != ENOENT) {

            error_setg_errno(errp, errno, "opendir(\"%s\")", dirpath);

        }

        g_free(dirpath);

        return;

    }