- remove more obsolete changes:

CFLAGS passing to qemu-traditional, PYTHON_PREFIX_ARG handling
  and pygrub installation

- update blktap-pv-cdrom.patch
  handle allocation errors in asprintf to fix compile errors
  handle value returned from xs_read properly
  remove casts from void pointers

- update xenalyze to revision 138
  Fix dump time calculation overflow
  move struct record_info into a header
  correctly display of count of HW events
  update trace.h to match xen-unstable
  Remove vestigal HW_IRQ trace records
  Remove decode of PV_UPDATE_VA_MAPPING
  automatically generate dependencies
  Get rid of redundant hvm dump_header
  Introduce more efficient read mechanism
  Eliminate unnecessary cycles_to_time calculation
  Rework math to remove two 64-bit divisions
  Enable -O2 optimization level
  Remove --dump-cooked
  Remove spurious dump_header construction
  Improve record-sorting algorithm
  Use long to cast into and out of pointers
  Make max_active_pcpu calculation smarter
  Optimize pcpu_string
  Enable more cr3 output
  Sort cr3 enumerated values by start time
  Add option to skip vga range in MMIO enumeration
  Handle MMIO records from different vmexits
  Relocate pio and mmio enumaration structs to their own sub-struct
  Handle new hvm_event traces
  Introduce generic summary functionality
  Function-ize setting of h->post_process
  Reorganize cr trace handling
  Allow several summary handlers to register on a single vmexit
  Get rid of all tabs in xenalyze.c
  Handle new IRQ tracing
  Decrease verbosity
  Print exit reason number if no string is available
  Fix minor summary issue
  Add string for TPR_BELOW_THRESHOLD
  Raise MAX_CPUS to 256 cpus.
  Add --report-pcpu option to report physical cpu utilization.
  increase MAX_CPUS
  Handle RUNSTATE_INIT in domain_runstate calculation

- update RPM_OPT_FLAGS handling in spec file
  pass EXTRA_CFLAGS via environment

- remove obsolete xencommons-proc-xen.patch

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

xen.spec

@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           xen
 ExclusiveArch:  %ix86 x86_64
 %define xvers 4.2
@@ -97,10 +98,10 @@ BuildRequires:  gcc46
 BuildRequires:  libgcc46
 BuildRequires:  libgcc46-32bit
 %endif
-BuildRequires:  glibc-32bit
-BuildRequires:  glibc-devel-32bit
 BuildRequires:  gcc-32bit
 BuildRequires:  gcc43-32bit
+BuildRequires:  glibc-32bit
+BuildRequires:  glibc-devel-32bit
 %define max_cpus 256
 %define pae_enabled n
 %else
@@ -114,7 +115,7 @@ BuildRequires:  kernel-syms
 BuildRequires:  module-init-tools
 BuildRequires:  xorg-x11
 %endif
-Version:        4.2.0_02
+Version:        4.2.0_03
 Release:        0
 PreReq:         %insserv_prereq %fillup_prereq
 Summary:        Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
@@ -198,7 +199,6 @@ Patch25965:     25965-x86-ucode-Intel-resume.patch
 # Our patches
 Patch301:       xend-config.diff
 Patch302:       xen-destdir.diff
-Patch303:       xen-rpmoptflags.diff
 Patch304:       xen-changeset.diff
 Patch305:       xen-paths.diff
 Patch306:       xen-xmexample.diff
@@ -282,7 +282,6 @@ Patch451:       ioemu-watchdog-linkage.patch
 Patch452:       ioemu-watchdog-ib700-timer.patch
 Patch453:       tools-watchdog-support.patch
 Patch454:       xend-console-port-restore.patch
-Patch455:       xencommons-proc-xen.patch
 Patch456:       xend-vcpu-affinity-fix.patch
 Patch457:       xen-cpupool-xl-config-format.patch
 Patch458:       ipxe-enable-nics.patch
@@ -312,8 +311,6 @@ Patch651:       ioemu-disable-scsi.patch
 Patch652:       ioemu-disable-emulated-ide-if-pv.patch
 Patch700:       hv_extid_compatibility.patch
 Patch701:       xen.no-default-runlevel-4.patch
-# xenalyze
-Patch20000:     xenalyze.gcc46.patch
 # Build patch
 Patch99998:     tmp-initscript-modprobe.patch
 Patch99999:     tmp_build.patch
@@ -651,7 +648,6 @@ Authors:
 %prep
 %setup -q -n %xen_build_dir -a 1 -a 2 -a 3 -a 4 -a 5 -a 20000
 tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
-%patch20000 -p1
 # Upstream patches
 %patch25833 -p1
 %patch25835 -p1
@@ -688,7 +684,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 # Our patches
 %patch301 -p1
 %patch302 -p1
-%patch303 -p1
 %patch304 -p1
 %patch305 -p1
 %patch306 -p1
@@ -769,7 +764,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch452 -p1
 %patch453 -p1
 %patch454 -p1
-%patch455 -p1
 %patch456 -p1
 %patch457 -p1
 %patch458 -p1
@@ -807,9 +801,9 @@ XEN_EXTRAVERSION=%version-%release
 XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}}
 sed -i "s/XEN_EXTRAVERSION[\t ]*.=.*\$/XEN_EXTRAVERSION  = $XEN_EXTRAVERSION/" xen/Makefile
 sed -i "s/XEN_CHANGESET[\t ]*=.*\$/XEN_CHANGESET     = %{changeset}/" xen/Makefile
-RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/}
-export CFLAGS="${RPM_OPT_FLAGS}"
-export RPM_OPT_FLAGS
+export EXTRA_CFLAGS_XEN_TOOLS="$RPM_OPT_FLAGS"
+export EXTRA_CFLAGS_QEMU_TRADITIONAL="$RPM_OPT_FLAGS"
+export EXTRA_CFLAGS_QEMU_XEN="$RPM_OPT_FLAGS"
 ./configure \
         --enable-xenapi \
         --prefix=/usr \
@@ -820,7 +814,7 @@ export RPM_OPT_FLAGS
         --datadir=%{_datadir}
 %if %{?with_dom0_support}0
 CFLAGS_SAVE=$CFLAGS
-make -C xenalyze.hg CC="gcc -I../xen/include" %{?_smp_mflags}
+make -C xenalyze.hg CC="gcc -I../xen/include -DMAX_CPUS=%{max_cpus} ${RPM_OPT_FLAGS}" %{?_smp_mflags} -k
 make -C tools/include/xen-foreign %{?_smp_mflags}
 make tools docs %{?_smp_mflags}
 make -C tools/debugger/gdbsx
@@ -847,7 +841,9 @@ done
 %endif
 
 %install
-export CFLAGS="$RPM_OPT_FLAGS"
+export EXTRA_CFLAGS_XEN_TOOLS="$RPM_OPT_FLAGS"
+export EXTRA_CFLAGS_QEMU_TRADITIONAL="$RPM_OPT_FLAGS"
+export EXTRA_CFLAGS_QEMU_XEN="$RPM_OPT_FLAGS"
 %if %{?with_dom0_support}0
 # EFI
 %ifarch x86_64