]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/stefanha/tags/qtest-monitor-process-pull-reques...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 21 Feb 2014 14:54:04 +0000 (14:54 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 21 Feb 2014 14:54:05 +0000 (14:54 +0000)
commit3e890c77cf038d8c2de66ed7996fe77a6f94787c
treed4d3e97d376c746030f206308bea3327279ee78b
parent7a87a7b3e4213f7b020e434b14f8890d41b93fb7
parentb15d422a23a3e4cf1b4195af209211eccdb88d51
Merge remote-tracking branch 'remotes/stefanha/tags/qtest-monitor-process-pull-request' into staging

qtest resource cleanup pull request

# gpg: Signature made Wed 19 Feb 2014 14:46:34 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/qtest-monitor-process-pull-request:
  qtest: kill QEMU process on g_assert() failure
  qtest: make QEMU our direct child process
  qtest: drop unused child_pid field

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