On Wed, Feb 19, 2014 at 07:23:24PM +0100, Andreas Färber wrote: > Am 19.02.2014 15:50, schrieb Stefan Hajnoczi: > > Reviewed by Paolo and Markus. Here is the pull request. > > > > v2: > > * Don't call qtest_end() from SIGABRT handler to avoid reentrancy [Paolo] > > * Use sigemptyset() to avoid assumption about signal mask [Markus] > > * if (fd != -1) close(fd) is no longer necessary [Markus] > > > > This series prevents the following qtest issues: > > > > 1. Leaking the pidfile if QEMU startup fails, as discovered by Andreas > > Färber. > > 2. Leaking the QEMU process when a test case aborts. > > > > Applying this series should make buildbots and manual "make check" users > > have a > > more pleasant and less leaky experience :). > > > > The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb: > > > > Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000) > > > > are available in the git repository at: > > > > git://github.com/stefanha/qemu.git tags/qtest-monitor-process-pull-request > > > > for you to fetch changes up to b15d422a23a3e4cf1b4195af209211eccdb88d51: > > > > qtest: kill QEMU process on g_assert() failure (2014-02-19 15:45:51 +0100) > > > > ---------------------------------------------------------------- > > qtest resource cleanup pull request > > > > ---------------------------------------------------------------- > > Stefan Hajnoczi (3): > > qtest: drop unused child_pid field > > qtest: make QEMU our direct child process > > qtest: kill QEMU process on g_assert() failure > > > > tests/libqtest.c | 59 > > +++++++++++++++++++++++++------------------------------- > > 1 file changed, 26 insertions(+), 33 deletions(-) > > Ack, my pending pull touches qtest.c rather than libqtest.c (hope you > remembered to check!) and changes look OK, didn't test yet though.
I took a quick look and don't see any conflicts/issues.
