OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-ga patch queue for 2.9

Browse Source 
* 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJY3dKIAAoJEDNTyc7xCLWEgyUH/2YposLFCSlb0PAKF/PA/OQI
 rjzju8VqsbZU9IWK0nOJ+F1eEzZnf1+zAcZKIW3jRLgER52SIhLQwj8ZFx6M1WPN
 u54ijTHMoUEocSoBFEBn45bCSW7Jos63gRpBdDvUaqoPRhdY9Beic9ERYPhW4E71
 SM7xpdtAdA7/TnvuGwnjiTSXRV1b5w2T+Ch3hPAD0JtL/SSGGZSl7zjaOaaz3ryP
 rknzEKhgTvuRZ9mJbfEvhKkBG5Ha2lk1pOHfn6oEEkRlp05A+GaRTTnLMRkd2nDy
 jf2ma3Ob26JM6q9xSeImluhXn3/Wefa7GFTlFmEQ1o0wBhD1Hp4f1KIMKaca0pk=
 =Bldb
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-03-31 11:09:51 +01:00
commit 05a6f451eb
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -3078,6 +3078,13 @@ if test "$modules" = yes; then
glib_modules="$glib_modules gmodule-2.0" glib_modules="$glib_modules gmodule-2.0"
fi 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 for i in $glib_modules; do
if $pkg_config --atleast-version=$glib_req_ver $i; then if $pkg_config --atleast-version=$glib_req_ver $i; then
glib_cflags=$($pkg_config --cflags $i) glib_cflags=$($pkg_config --cflags $i)

2
qga/commands-posix.c
View File

@ -999,7 +999,9 @@ static void build_guest_fsinfo_for_virtual_device(char const *syspath,
dirpath = g_strdup_printf("%s/slaves", syspath); dirpath = g_strdup_printf("%s/slaves", syspath);
dir = opendir(dirpath); dir = opendir(dirpath);
if (!dir) { if (!dir) {
if (errno != ENOENT) {
error_setg_errno(errp, errno, "opendir(\"%s\")", dirpath); error_setg_errno(errp, errno, "opendir(\"%s\")", dirpath);
}
g_free(dirpath); g_free(dirpath);
return; return;
} }