From: Peter Maydell Date: Mon, 14 Jan 2019 10:11:36 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into... X-Git-Tag: qemu-xen-4.13.0-rc1~449 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d63a6af935327945eaf687da6119fbabe03be3f9;p=qemu-xen.git Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging Work around test-qht-par + gprof issues Travis CI jobs are failing because of test-qht-par when gprof is enabled. Temporarily disable test-qht-par if gprof is enabled, until we fix the bug. # gpg: Signature made Fri 11 Jan 2019 18:23:29 GMT # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost " # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-next-pull-request: tests: Disable qht-bench parallel test when using gprof configure: Let the TARGET_GPROF var use the regular 'y' for Yes Signed-off-by: Peter Maydell --- d63a6af935327945eaf687da6119fbabe03be3f9