From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 8 Mar 2019 16:31:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-03-08' into... 
X-Git-Tag: v4.0.0-rc0~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=234afe78281b10a798fb97c584e1b677844aaab8;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-03-08' into staging

- qtest fixes
- Some generic clean-ups by Philippe
- macOS CI testing via cirrus-ci.com

# gpg: Signature made Fri 08 Mar 2019 08:58:47 GMT
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-03-08:
  cirrus.yml: Add macOS continuous integration task
  tests/bios-tables: Improve portability by searching bash in the $PATH
  vhost-user-test: fix leaks
  tests: Do not use "\n" in g_test_message() strings
  hw/devices: Remove unused TC6393XB_RAM definition
  hw: Remove unused 'hw/devices.h' include
  tests: Move qdict-test-data.txt to tests/data/qobject/

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	tests/vhost-user-test.c
---

234afe78281b10a798fb97c584e1b677844aaab8
diff --cc tests/vhost-user-test.c
index 92dfeeddf48,14a1e2fbac5..0c965b3b1e1
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@@ -437,8 -476,8 +437,8 @@@ static const char *init_hugepagefs(void
      }
  
      if (access(path, R_OK | W_OK | X_OK)) {
-         g_test_message("access on path (%s): %s\n", path, strerror(errno));
+         g_test_message("access on path (%s): %s", path, strerror(errno));
 -        abort();
 +        g_test_fail();
          return NULL;
      }
  
@@@ -447,14 -486,14 +447,14 @@@
      } while (ret != 0 && errno == EINTR);
  
      if (ret != 0) {
-         g_test_message("statfs on path (%s): %s\n", path, strerror(errno));
+         g_test_message("statfs on path (%s): %s", path, strerror(errno));
 -        abort();
 +        g_test_fail();
          return NULL;
      }
  
      if (fs.f_type != HUGETLBFS_MAGIC) {
-         g_test_message("Warning: path not on HugeTLBFS: %s\n", path);
+         g_test_message("Warning: path not on HugeTLBFS: %s", path);
 -        abort();
 +        g_test_fail();
          return NULL;
      }