[vdsm] Removing patches from ovirt-3.3, using new 4.13.3 tag

[Yaniv Bronhaim]

commit 088eb71d57c7551b628e29f7acd8b3289aead21b
Author: Yaniv Bronhaim <ybronhei at redhat.com>
Date:   Mon Jan 13 15:50:39 2014 +0200

    Removing patches from ovirt-3.3, using new 4.13.3 tag
    
    Additional fix for import error

 0001-Reorder-limit-checks-in-grow-quest.patch      |   42 ---
 0001-Using-old-form-of-zombiereaper.patch          |   45 +++
 0002-domainMonitor-Improve-logging.patch           |   55 ----
 ...osity-from-restorecon-hack-for-var-log-co.patch |   36 ---
 ...l-expect-integer-vlan-id-from-new-netinfo.patch |   37 ---
 ...rect-parameter-for-creating-hookpath-in-v.patch |   39 ---
 ...-vdsm.spec-Remove-Obsoletes-python-cpopen.patch |   33 --
 0007-Allow-disable-MOM-KSM-control.patch           |   53 ----
 ...setting-just-a-single-value-in-MoM-policy.patch |  120 --------
 ...ption-when-shutdown-called-on-vm-in-Down-.patch |   42 ---
 ...threadPool-Do-not-keep-reference-to-tasks.patch |   55 ----
 ...or-Separate-change-detection-from-lastChe.patch |   84 -----
 ...dd-unhandled-exceptions-logging-decorator.patch |  150 ---------
 ...or-Log-unhandled-exceptions-in-domain-mon.patch |   48 ---
 ...andled-exceptions-in-storage-refresh-thre.patch |   39 ---
 0015-Fix-syntax-error-in-vdsm.spec.patch           |   32 --
 ...kerLink-log-level-to-prevent-log-flooding.patch |   59 ----
 ...eVolumePath-correct-path-handling-for-cdr.patch |   51 ---
 ...omains-list-for-disks-attached-to-vm-afte.patch |   34 --
 ...leSD-Fix-image-deletion-on-gluster-domain.patch |   75 -----
 ...ling-make-HostStatsThread-a-daemon-thread.patch |   34 --
 ...repareVolumePath-payload-misdetection-fix.patch |   50 ---
 ...e-NIC-having-no-custom-properies-is-valid.patch |   38 ---
 ...PC-bugfix-Fix-netinfo-getIfaceByIP-unit-t.patch |   52 ----
 ...ck-missing-before_device_migrate_source-h.patch |   37 ---
 ...PC-bugfix-Return-lastClientIface-for-curr.patch |  128 --------
 ...ster-API-verbs-will-now-be-callable-again.patch |   86 ------
 0027-iscsi-Iscsi-rescan-cleanup.patch              |  324 --------------------
 ...rk-Fix-bridgeless-broken-network-deletion.patch |  111 -------
 0029-utils-Create-AsyncProcessOperation.patch      |  173 -----------
 ...necessary-check-local-from-storage-Makefi.patch |   41 ---
 vdsm.spec                                          |    5 +
 32 files changed, 50 insertions(+), 2158 deletions(-)
---
diff --git a/0001-Using-old-form-of-zombiereaper.patch b/0001-Using-old-form-of-zombiereaper.patch
new file mode 100644
index 0000000..cbe38ed
--- /dev/null
+++ b/0001-Using-old-form-of-zombiereaper.patch
@@ -0,0 +1,45 @@
+From d1bb20a892d32822e8f04488fb12df0ffea76a04 Mon Sep 17 00:00:00 2001
+From: Yaniv Bronhaim <ybronhei at redhat.com>
+Date: Mon, 13 Jan 2014 14:55:35 +0200
+Subject: [PATCH] Using old form of zombiereaper
+
+In ovirt-3.3 we don't include the change [1] that modifies zombieReaper
+to zombiereaper.
+
+The import in utils.py cause an import error without having [1].
+
+[1] http://gerrit.ovirt.org/#/c/19253/
+
+Change-Id: I7483e09df69d07b8396e075726dd14efb42a5551
+Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/23215
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ lib/vdsm/utils.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/vdsm/utils.py b/lib/vdsm/utils.py
+index 5a2f746..0d3ec91 100644
+--- a/lib/vdsm/utils.py
++++ b/lib/vdsm/utils.py
+@@ -48,7 +48,7 @@ import stat
+ import subprocess
+ import threading
+ import time
+-import zombiereaper
++import zombieReaper
+ 
+ from cpopen import CPopen as BetterPopen
+ from config import config
+@@ -983,7 +983,7 @@ class AsyncProcessOperation(object):
+ 
+     def __del__(self):
+         if self._proc.returncode is None:
+-            zombiereaper.autoReapPID(self._proc.pid)
++            zombieReaper.autoReapPID(self._proc.pid)
+ 
+ 
+ def panic(msg):
+-- 
+1.8.4.2
+
diff --git a/vdsm.spec b/vdsm.spec
index a7f6320..3e22b8c 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -60,6 +60,9 @@ Url:            http://www.ovirt.org/wiki/Vdsm
 #  ./autogen.sh --system
 #  make VERSION={version}-{vdsm_release} dist
 Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
+# ovirt-3.3.3 patches
+Patch0:         0001-Reorder-limit-checks-in-grow-quest.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python
@@ -558,6 +561,8 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 
 %prep
 %setup -q
+# ovirt-3.3.3 patches
+%patch0 -p1
 
 %if 0%{?rhel} == 6
 sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in