- bnc#556939 - Improve device map cleanup code in domUloader

- bnc# 578910 - xm block-detach does not cleanup xenstore
  hotplug-cleanup-fix.patch  

- bnc#579361 - Windows Server 2003 cannot wake up from stand by in 
  sp1 
  hibernate.patch

- fate#308852: XEN CPU Pools
  cpupools-core.patch
  cpupools-core-fixup.patch
  keyhandler-alternative.patch
  cpu-pools-libxc.patch
  cpu-pools-python.patch
  cpu-pools-libxen.patch
  cpu-pools-xmtest.patch
  cpu-pools-docs.patch

- bnc#558760: Disable scsi devices when PV drivers are loaded. 

- Update to changeset 20951 Xen 4.0.0 RC4 for sle11-sp1 beta5. 

- bnc#572146 - SLES11 SP1 beta 2 Xen - BUG: soft lockup - CPU#31 
  stuck for 61s! [kstop/31:4512] 
  cpuidle-hint-v3.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=31

xen.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package xen (Version 4.0.0_20900_01)
+# spec file for package xen (Version 4.0.0_20978_01)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,9 +22,9 @@ Name:           xen
 ExclusiveArch:  %ix86 x86_64
 %define xvers 4.0
 %define xvermaj 4
-%define changeset 20900
+%define changeset 20978
 %define xen_build_dir xen-4.0.0-testing
-%define with_kmp 1
+%define with_kmp 0
 BuildRequires:  LibVNCServer-devel SDL-devel automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel texinfo transfig
 %if %suse_version >= 1030
 BuildRequires:  texlive texlive-latex
@@ -37,7 +37,7 @@ BuildRequires:  glibc-32bit glibc-devel-32bit
 %if %{?with_kmp}0
 BuildRequires:  kernel-source kernel-syms module-init-tools xorg-x11
 %endif
-Version:        4.0.0_20900_01
+Version:        4.0.0_20978_01
 Release:        1
 License:        GPL v2 only
 Group:          System/Kernel
@@ -90,7 +90,6 @@ Patch312:       serial-split.patch
 Patch313:       xen-xm-top-needs-root.diff
 Patch314:       xen-max-free-mem.diff
 Patch315:       xen-disable-libxl.diff
-Patch316:       xen-disable-xenpaging.diff
 Patch320:       block-losetup-retry.diff
 Patch321:       block-flags.diff
 Patch322:       bridge-opensuse.patch
@@ -125,6 +124,14 @@ Patch359:       qemu-console-retry.patch
 Patch360:       checkpoint-rename.patch
 Patch361:       xm-save-check-file.patch 
 Patch362:       xm-create-xflag.patch
+Patch363:       cpupools-core.patch
+Patch364:       cpupools-core-fixup.patch
+Patch365:       keyhandler-alternative.patch
+Patch366:       cpu-pools-libxc.patch
+Patch367:       cpu-pools-python.patch
+Patch368:       cpu-pools-libxen.patch
+Patch369:       cpu-pools-xmtest.patch
+Patch370:       cpu-pools-docs.patch
 # Patches for snapshot support
 Patch400:       snapshot-ioemu-save.patch
 Patch401:       snapshot-ioemu-restore.patch
@@ -147,6 +154,7 @@ Patch425:       ioemu-bdrv-open-CACHE_WB.patch
 Patch426:       xen-ioemu-hvm-pv-support.diff
 Patch427:       qemu-dm-segfault.patch
 Patch428:       shadow.patch
+Patch429:       hibernate.patch
 # Jim's domain lock patch
 Patch450:       xend-domain-lock.patch
 # Hypervisor and PV driver Patches
@@ -165,6 +173,7 @@ Patch511:       pv-driver-build.patch
 Patch512:       supported_module.diff
 Patch513:       magic_ioport_compat.patch
 Patch650:       disable_emulated_device.diff
+Patch651:       ioemu-disable-scsi.patch 
 # novell_shim patches
 Patch700:       hv_tools.patch
 Patch701:       hv_xen_base.patch
@@ -520,7 +529,6 @@ Authors:
 %patch313 -p1
 %patch314 -p1
 %patch315 -p1
-%patch316 -p1
 #%patch320 -p1
 #%patch321 -p1
 %patch322 -p1
@@ -554,8 +562,16 @@ Authors:
 %patch360 -p1
 %patch361 -p1
 %patch362 -p1
+%patch363 -p1
+%patch364 -p1
+%patch365 -p1
+%patch366 -p1
+%patch367 -p1
+%patch368 -p1
+%patch369 -p1
+%patch370 -p1
 %patch400 -p1
-#%patch401 -p1
+%patch401 -p1
 %patch402 -p1
 %patch403 -p1
 %patch410 -p1
@@ -573,6 +589,7 @@ Authors:
 %patch426 -p1
 %patch427 -p1
 %patch428 -p1
+%patch429 -p1
 %patch450 -p1
 %patch500 -p1
 %patch501 -p1
@@ -589,6 +606,7 @@ Authors:
 %patch512 -p1
 %patch513 -p1
 %patch650 -p1
+%patch651 -p1
 %patch700 -p1
 %patch701 -p1
 %patch702 -p1
@@ -762,8 +780,13 @@ rm -f  $RPM_BUILD_ROOT/usr/sbin/netfix
 rm -f  $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/*.egg-info
 rm -rf $RPM_BUILD_ROOT/html
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
-rm -f  $RPM_BUILD_ROOT/usr/share/create.dtd
+rm -f  $RPM_BUILD_ROOT/usr/share/xen/create.dtd
 rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/qemu-img-xen
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/qemu-nbd-xen
+# FATE feature for remus rejected
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/remus
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/xen/remus
 # This is necessary because of the build of libconfig for libxl
 #rm -rf  $RPM_BUILD_ROOT/$RPM_BUILD_ROOT
 
@@ -798,11 +821,11 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 /usr/bin/xenstore*
 /usr/bin/xentrace*
 /usr/bin/pygrub
-/usr/bin/qemu-img-xen
-/usr/bin/qemu-nbd-xen
+#/usr/bin/qemu-img-xen
+#/usr/bin/qemu-nbd-xen
 /usr/bin/tapdisk-ioemu
 /usr/bin/gdbserver-xen
-/usr/bin/remus
+#/usr/bin/remus
 /usr/sbin/blktapctrl
 /usr/sbin/flask-loadpolicy
 /usr/sbin/flask-getenforce
@@ -954,6 +977,18 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 %post tools
 %{fillup_and_insserv -y -n xend xend}
 %{fillup_and_insserv -y -n xendomains xendomains}
+if [ -f /usr/bin/qemu-img ]; then
+    if [ -f /usr/bin/qemu-img-xen ]; then
+        rm /usr/bin/qemu-img-xen
+    fi
+    ln -s /usr/bin/qemu-img /usr/bin/qemu-img-xen
+fi
+if [ -f /usr/bin/qemu-nbd ]; then
+    if [ -f /usr/bin/qemu-nbd-xen ]; then
+        rm /usr/bin/qemu-nbd-xen
+    fi
+    ln -s /usr/bin/qemu-nbd /usr/bin/qemu-nbd-xen
+fi
 
 %preun tools
 %{stop_on_removal xendomains xend}
@@ -961,6 +996,12 @@ rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 %postun tools
 %{restart_on_update xend}
 %{insserv_cleanup}
+if [ -f /usr/bin/qemu-img-xen ]; then
+    rm /usr/bin/qemu-img-xen
+fi
+if [ -f /usr/bin/qemu-nbd-xen ]; then
+    rm /usr/bin/qemu-nbd-xen
+fi
 
 %post libs
 /sbin/ldconfig