From c75b1b0e5bb7cdb26a4940cd501fe48376c66d1e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 5 Jul 2016 00:03:17 -0700
Subject: [PATCH] isolate a fix from PR #524 to fix worker crash on job cancel

---
 ...ignal-handler-i.e.-during-worker-can.patch | 29 +++++++++++++++++++
 os-autoinst.spec                              |  9 +++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch

diff --git a/0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch b/0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch
new file mode 100644
index 0000000..2d663b0
--- /dev/null
+++ b/0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch
@@ -0,0 +1,29 @@
+From 5e04cf7f0e34eaba2884bf70e3f0a93165bad28e Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Mon, 4 Jul 2016 23:48:22 -0700
+Subject: [PATCH] Stop the vm on signal handler (i.e. during worker cancel)
+
+This is like:
+https://github.com/os-autoinst/os-autoinst/pull/524/commits/4d9a31f
+but without the changes that don't apply to current git master,
+as a temporary fix for #530 (which we're hitting on Fedora
+deployments).
+---
+ isotovideo | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/isotovideo b/isotovideo
+index fd5aac6..1ced6f1 100755
+--- a/isotovideo
++++ b/isotovideo
+@@ -85,6 +85,7 @@ sub signalhandler {
+         $autotest::running->fail_if_running();
+         $autotest::running = undef;
+     }
++    bmwqemu::stop_vm();
+     if (defined $backend && $backend->{backend_pid}) {
+         diag("$$: killing backend process $backend->{backend_pid}");
+         kill('SIGTERM', $backend->{backend_pid});
+-- 
+2.9.0
+
diff --git a/os-autoinst.spec b/os-autoinst.spec
index fa4f8ba..8074ffe 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -31,12 +31,16 @@
 
 Name:           os-autoinst
 Version:        %{github_version}
-Release:        13%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release:        14%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
 Summary:        OS-level test automation
 License:        GPLv2+
 Group:          Development/System
 URL:            https://os-autoinst.github.io/openQA/
 Source0:        https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz
+# This is based on a commit from
+# https://github.com/os-autoinst/os-autoinst/pull/524
+# Fixes https://github.com/os-autoinst/os-autoinst/issues/530
+Patch0:         0001-Stop-the-vm-on-signal-handler-i.e.-during-worker-can.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -190,6 +194,9 @@ make check VERBOSE=1
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
 
 %changelog
+* Mon Jul 04 2016 Adam Williamson <awilliam@redhat.com> - 4.3-14.20160624gitfe19b00
+- fix worker crash on job cancel (#530) with a single commit from PR #524
+
 * Tue Jun 28 2016 Adam Williamson <awilliam@redhat.com> - 4.3-13.20160624gitfe19b00
 - bump to latest upstream git, drop merged patches