- Upstream patches from Jan

23726-x86-intel-flexmigration.patch
  23706-fix-20892.patch
  23723-x86-CMOS-lock.patch
  23676-x86_64-image-map-bounds.patch
  23724-x86-smpboot-x2apic.patch 

- hotplug.losetup.patch
  correct dev:inode detection, stat returns major:minor without 
  leading zeros, while losetup -a includes trailing zeros

- fate#310635: xen npiv multipath support
  update block-npiv* scripts for testing

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

xen.spec

@@ -25,7 +25,7 @@ ExclusiveArch:  %ix86 x86_64
 %define changeset 23079
 %define xen_build_dir xen-4.1.1-testing
 %define with_kmp 1
-%define with_stubdom 0
+%define with_stubdom 1
 %ifarch x86_64
 %define with_dom0_support 1
 %else
@@ -73,7 +73,8 @@ BuildRequires:  tetex
 %endif
 %ifarch x86_64
 # EFI requires gcc45 or newer
-BuildRequires:  gcc45
+BuildRequires:  gcc46
+BuildRequires:  libgcc46 libgcc46-32bit
 BuildRequires:  glibc-32bit glibc-devel-32bit
 BuildRequires:  gcc-32bit
 BuildRequires:  gcc43-32bit
@@ -172,6 +173,11 @@ Patch39:        23613-EFI-headers.patch
 Patch40:        23614-x86_64-EFI-boot.patch
 Patch41:        23615-x86_64-EFI-runtime.patch
 Patch42:        23616-x86_64-EFI-MPS.patch
+Patch43:        23676-x86_64-image-map-bounds.patch
+Patch44:        23706-fix-20892.patch
+Patch45:        23723-x86-CMOS-lock.patch
+Patch46:        23724-x86-smpboot-x2apic.patch
+Patch47:        23726-x86-intel-flexmigration.patch
 # Upstream qemu patches
 # Our patches
 Patch300:       xen-config.diff
@@ -226,7 +232,7 @@ Patch371:       domu-usb-controller.patch
 Patch372:       usb-list.patch
 Patch373:       xend-devid-or-name.patch
 Patch374:       suspend_evtchn_lock.patch
-Patch375:       log-guest-console.patch
+Patch375:	log-guest-console.patch
 # Patches for snapshot support
 Patch400:       snapshot-ioemu-save.patch
 Patch401:       snapshot-ioemu-restore.patch
@@ -288,7 +294,6 @@ Patch511:       supported_module.diff
 Patch512:       magic_ioport_compat.patch
 Patch513:       xen.sles11sp1.bug684297.xen_oldmem_pfn_is_ram.patch
 Patch514:       xen.sles11sp1.fate311487.xen_platform_pci.dmistring.patch
-Patch515:       x86-EFI-discard-comment.patch
 Patch650:       disable_emulated_device.diff
 Patch651:       ioemu-disable-scsi.patch
 Patch652:       ioemu-disable-emulated-ide-if-pv.patch
@@ -432,7 +437,6 @@ Authors:
     Ian Pratt <ian.pratt@cl.cam.ac.uk>
 
 %if %{?with_dom0_support}0
-
 %package tools
 License:        GPLv2+
 Summary:        Xen Virtualization: Control tools for domain 0
@@ -613,7 +617,6 @@ Xen, but is not available for release due to license restrictions.
 %endif
 
 %if %{?with_dom0_support}0
-
 %package doc-html
 License:        GPLv2+
 Summary:        Xen Virtualization: HTML documentation
@@ -700,6 +703,11 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
 %patch300 -p1
 %patch301 -p1
 %patch302 -p1
@@ -808,7 +816,6 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch512 -p1
 %patch513 -p1
 %patch514 -p1
-%patch515 -p1
 %patch650 -p1
 %patch651 -p1
 %patch652 -p1
@@ -879,7 +886,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 %if %{?with_dom0_support}0
 # EFI
 %ifarch x86_64
-make -C xen install CC=gcc-4.5 max_phys_cpus=%{max_cpus} debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
+make -C xen install CC=gcc-4.6 max_phys_cpus=%{max_cpus} debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
 make -C xen clean
 %endif
 install_xen()
@@ -940,7 +947,7 @@ install -m644 %SOURCE20 $RPM_BUILD_ROOT/etc/modprobe.d/xen_pvdrivers.conf
 %if %{?with_dom0_support}0
 # Stubdom
 %if %{?with_stubdom}0
-make stubdom %{?_smp_mflags}
+make stubdom
 make -C stubdom install \
     DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
     DOCDIR=%{_defaultdocdir}/xen INCDIR=%{_includedir}
@@ -1062,7 +1069,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 %endif
 
 %if %{?with_dom0_support}0
-
 %files
 %defattr(-,root,root)
 /boot/xen-%{version}-%{release}.gz
@@ -1090,7 +1096,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 %{_libdir}/*.so.*
 
 %if %{?with_dom0_support}0
-
 %files tools
 %defattr(-,root,root)
 /usr/bin/xenalyze
@@ -1244,7 +1249,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 /usr/include/*
 
 %if %{?with_dom0_support}0
-
 %files doc-html
 %defattr(-,root,root)
 %{_defaultdocdir}/xen/html
@@ -1255,7 +1259,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 %endif
 
 %if %{?with_dom0_support}0
-
 %post tools
 %if %{?with_xend}0
 # with_xend