SHA256
1
0
forked from pool/xen

- add xorg-x11-util-devel to BuildRequires to get lndir(1)

- remove xen.migrate.tools_notify_restore_to_hangup_during_migration_--abort_if_busy.patch
  It changed migration protocol and upstream wants a different solution

- bnc#802221 - fix xenpaging
  readd xenpaging.qemu.flush-cache.patch

- Upstream patches from Jan
  26891-x86-S3-Fix-cpu-pool-scheduling-after-suspend-resume.patch
  26930-x86-EFI-fix-runtime-call-status-for-compat-mode-Dom0.patch
- Additional fix for bnc#816159
  CVE-2013-1918-xsa45-followup.patch

- bnc#817068 - Xen guest with >1 sr-iov vf won't start
  xen-managed-pci-device.patch

- Update to Xen 4.2.2 c/s 26064
  The following recent security patches are included in the tarball
  CVE-2013-0151-xsa34.patch (bnc#797285)
  CVE-2012-6075-xsa41.patch (bnc#797523)
  CVE-2013-1917-xsa44.patch (bnc#813673)
  CVE-2013-1919-xsa46.patch (bnc#813675)

- Upstream patch from Jan
  26902-x86-EFI-pass-boot-services-variable-info-to-runtime-code.patch 

- bnc#816159 - VUL-0: xen: CVE-2013-1918: XSA-45: Several long
  latency operations are not preemptible
  CVE-2013-1918-xsa45-1-vcpu-destroy-pagetables-preemptible.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=237
This commit is contained in:
2013-05-07 14:35:00 +00:00
committed by Git OBS Bridge
parent 9c5584a232
commit b9d38dfc8d
119 changed files with 2932 additions and 5587 deletions

187
xen.spec
View File

@@ -20,8 +20,8 @@ Name: xen
ExclusiveArch: %ix86 x86_64
%define xvers 4.2
%define xvermaj 4
%define changeset 25952
%define xen_build_dir xen-4.2.1-testing
%define changeset 26064
%define xen_build_dir xen-4.2.2-testing
%define with_kmp 1
%define with_stubdom 1
# EFI requires gcc46 or newer
@@ -114,14 +114,15 @@ BuildRequires: kernel-source
BuildRequires: kernel-syms
BuildRequires: module-init-tools
BuildRequires: xorg-x11
BuildRequires: xorg-x11-util-devel
%endif
Version: 4.2.1_12
Version: 4.2.2_01
Release: 0
PreReq: %insserv_prereq %fillup_prereq
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
License: GPL-2.0+
Group: System/Kernel
Source0: xen-4.2.1-testing-src.tar.bz2
Source0: xen-4.2.2-testing-src.tar.bz2
Source1: stubdom.tar.bz2
Source2: qemu-xen-traditional-dir-remote.tar.bz2
Source3: qemu-xen-dir-remote.tar.bz2
@@ -173,7 +174,6 @@ Patch25866: 25866-sercon-ns16550-pci-irq.patch
Patch25867: 25867-sercon-ns16550-parse.patch
Patch25874: 25874-x86-EFI-chain-cfg.patch
Patch25909: 25909-xenpm-consistent.patch
Patch25912: 25912-partial-libxl.patch
Patch25920: 25920-x86-APICV-enable.patch
Patch25921: 25921-x86-APICV-delivery.patch
Patch25922: 25922-x86-APICV-x2APIC.patch
@@ -182,8 +182,6 @@ Patch25957: 25957-x86-TSC-adjust-HVM.patch
Patch25958: 25958-x86-TSC-adjust-sr.patch
Patch25959: 25959-x86-TSC-adjust-expose.patch
Patch25975: 25975-x86-IvyBridge.patch
Patch26060: 26060-ACPI-ERST-table-size-checks.patch
Patch26062: 26062-ACPI-ERST-move-data.patch
Patch26077: 26077-stubdom_fix_compile_errors_in_grub.patch
Patch26078: 26078-hotplug-Linux_remove_hotplug_support_rely_on_udev_instead.patch
Patch26079: 26079-hotplug-Linux_close_lockfd_after_lock_attempt.patch
@@ -197,20 +195,8 @@ Patch26087: 26087-hotplug-Linux_install_sysconfig_files_as_data_files.patch
Patch26114: 26114-pygrub-list-entries.patch
Patch26129: 26129-ACPI-BGRT-invalidate.patch
Patch26133: 26133-IOMMU-defer-BM-disable.patch
Patch26183: 26183-x86-HPET-masking.patch
Patch26189: 26189-xenstore-chmod.patch
Patch26200: 26200-IOMMU-debug-verbose.patch
Patch26235: 26235-IOMMU-ATS-max-queue-depth.patch
Patch26252: 26252-VMX-nested-rflags.patch
Patch26253: 26253-VMX-nested-rdtsc.patch
Patch26254: 26254-VMX-nested-dr.patch
Patch26255: 26255-VMX-nested-ia32e-mode.patch
Patch26258: 26258-VMX-nested-intr-delivery.patch
Patch26262: 26262-x86-EFI-secure-shim.patch
Patch26266: 26266-sched-ratelimit-check.patch
Patch26287: 26287-sched-credit-pick-idle.patch
Patch26294: 26294-x86-AMD-Fam15-way-access-filter.patch
Patch26320: 26320-IOMMU-domctl-assign-seg.patch
Patch26324: 26324-IOMMU-assign-params.patch
Patch26325: 26325-IOMMU-add-remove-params.patch
Patch26326: 26326-VT-d-context-map-params.patch
@@ -219,9 +205,6 @@ Patch26328: 26328-IOMMU-pdev-type.patch
Patch26329: 26329-IOMMU-phantom-dev.patch
Patch26330: 26330-VT-d-phantom-MSI.patch
Patch26331: 26331-IOMMU-phantom-dev-quirk.patch
Patch26332: 26332-x86-compat-show-guest-stack-mfn.patch
Patch26333: 26333-x86-get_page_type-assert.patch
Patch26340: 26340-VT-d-intremap-verify-legacy-bridge.patch
Patch26341: 26341-hvm-firmware-passthrough.patch
Patch26342: 26342-hvm-firmware-passthrough.patch
Patch26343: 26343-hvm-firmware-passthrough.patch
@@ -229,27 +212,9 @@ Patch26344: 26344-hvm-firmware-passthrough.patch
Patch26369: 26369-libxl-devid.patch
Patch26370: 26370-libxc-x86-initial-mapping-fit.patch
Patch26372: 26372-tools-paths.patch
Patch26395: 26395-x86-FPU-context-conditional.patch
Patch26404: 26404-x86-forward-both-NMI-kinds.patch
Patch26418: 26418-x86-trampoline-consider-multiboot.patch
Patch26427: 26427-x86-AMD-enable-WC+.patch
Patch26428: 26428-x86-HVM-RTC-update.patch
Patch26440: 26440-x86-forward-SERR.patch
Patch26443: 26443-ACPI-zap-DMAR.patch
Patch26444: 26444-x86-nHVM-no-self-enable.patch
Patch26468: 26468-libxl-race.patch
Patch26469: 26469-libxl-race.patch
Patch26501: 26501-VMX-simplify-CR0-update.patch
Patch26502: 26502-VMX-disable-SMEP-when-not-paging.patch
Patch26516: 26516-ACPI-parse-table-retval.patch
Patch26517: 26517-AMD-IOMMU-clear-irtes.patch
Patch26518: 26518-AMD-IOMMU-disable-if-SATA-combined-mode.patch
Patch26519: 26519-AMD-IOMMU-perdev-intremap-default.patch
Patch26526: 26526-pvdrv-no-devinit.patch
Patch26529: 26529-gcc48-build-fix.patch
Patch26531: 26531-AMD-IOMMU-IVHD-special-missing.patch
Patch26532: 26532-AMD-IOMMU-phantom-MSI.patch
Patch26536: 26536-xenoprof-div-by-0.patch
Patch26547: 26547-tools-xc_fix_logic_error_in_stdiostream_progress.patch
Patch26548: 26548-tools-xc_handle_tty_output_differently_in_stdiostream_progress.patch
Patch26549: 26549-tools-xc_turn_XCFLAGS__into_shifts.patch
@@ -260,36 +225,20 @@ Patch26555: 26555-hvm-firmware-passthrough.patch
Patch26556: 26556-hvm-firmware-passthrough.patch
Patch26576: 26576-x86-APICV-migration.patch
Patch26577: 26577-x86-APICV-x2APIC.patch
Patch26578: 26578-AMD-IOMMU-replace-BUG_ON.patch
Patch26585: 26585-x86-mm-Take-the-p2m-lock-even-in-shadow-mode.patch
Patch26595: 26595-x86-nhvm-properly-clean-up-after-failure-to-set-up-all-vCPU-s.patch
Patch26601: 26601-honor-ACPI-v4-FADT-flags.patch
Patch26656: 26656-x86-fix-null-pointer-dereference-in-intel_get_extended_msrs.patch
Patch26659: 26659-AMD-IOMMU-erratum-746-workaround.patch
Patch26660: 26660-x86-fix-CMCI-injection.patch
Patch26672: 26672-vmx-fix-handling-of-NMI-VMEXIT.patch
Patch26673: 26673-Avoid-stale-pointer-when-moving-domain-to-another-cpupool.patch
Patch26675: 26675-tools-xentoollog_update_tty_detection_in_stdiostream_progress.patch
Patch26676: 26676-fix-compat-memory-exchange-op-splitting.patch
Patch26677: 26677-x86-make-certain-memory-sub-ops-return-valid-values.patch
Patch26678: 26678-SEDF-avoid-gathering-vCPU-s-on-pCPU0.patch
Patch26679: 26679-x86-defer-processing-events-on-the-NMI-exit-path.patch
Patch26683: 26683-credit1-Use-atomic-bit-operations-for-the-flags-structure.patch
Patch26686: 26686-xentrace-fix-off-by-one-in-calculate_tbuf_size.patch
Patch26689: 26689-fix-domain-unlocking-in-some-xsm-error-paths.patch
Patch26692: 26692-x86-fully-protect-MSI-X-table-from-PV-guest-accesses.patch
Patch26702: 26702-powernow-add-fixups-for-AMD-P-state-figures.patch
Patch26704: 26704-x86-MCA-suppress-bank-clearing-for-certain-injected-events.patch
Patch26731: 26731-AMD-IOMMU-Process-softirqs-while-building-dom0-iommu-mappings.patch
Patch26733: 26733-VT-d-Enumerate-IOMMUs-when-listing-capabilities.patch
Patch26734: 26734-ACPI-ERST-Name-table-in-otherwise-opaque-error-messages.patch
Patch26736: 26736-ACPI-APEI-Unlock-apei_iomaps_lock-on-error-path.patch
Patch26737: 26737-ACPI-APEI-Add-apei_exec_run_optional.patch
Patch26742: 26742-IOMMU-properly-check-whether-interrupt-remapping-is-enabled.patch
Patch26743: 26743-VT-d-deal-with-5500-5520-X58-errata.patch
Patch26744: 26744-AMD-IOMMU-allow-disabling-only-interrupt-remapping.patch
Patch34: CVE-2013-0151-xsa34.patch
Patch41: CVE-2012-6075-xsa41.patch
Patch26891: 26891-x86-S3-Fix-cpu-pool-scheduling-after-suspend-resume.patch
Patch26902: 26902-x86-EFI-pass-boot-services-variable-info-to-runtime-code.patch
Patch26930: 26930-x86-EFI-fix-runtime-call-status-for-compat-mode-Dom0.patch
Patch4501: CVE-2013-1918-xsa45-1-vcpu-destroy-pagetables-preemptible.patch
Patch4502: CVE-2013-1918-xsa45-2-new-guest-cr3-preemptible.patch
Patch4503: CVE-2013-1918-xsa45-3-new-user-base-preemptible.patch
Patch4504: CVE-2013-1918-xsa45-4-vcpu-reset-preemptible.patch
Patch4505: CVE-2013-1918-xsa45-5-set-info-guest-preemptible.patch
Patch4506: CVE-2013-1918-xsa45-6-unpin-preemptible.patch
Patch4507: CVE-2013-1918-xsa45-7-mm-error-paths-preemptible.patch
Patch4508: CVE-2013-1918-xsa45-followup.patch
Patch48: CVE-2013-1922-xsa48.patch
Patch49: CVE-2013-1952-xsa49.patch
Patch88: xen.migrate.tools-xc_print_messages_from_xc_save_with_xc_report.patch
Patch89: xen.migrate.tools-xc_document_printf_calls_in_xc_restore.patch
Patch90: xen.migrate.tools-xc_rework_xc_save.cswitch_qemu_logdirty.patch
@@ -298,7 +247,6 @@ Patch92: xen.migrate.tools_add_xm_migrate_--log_progress_option.patch
Patch93: xen.migrate.tools-xend_move_assert_to_exception_block.patch
Patch94: xen.migrate.tools-libxc_print_stats_if_migration_is_aborted.patch
Patch95: xen.migrate.tools_set_number_of_dirty_pages_during_migration.patch
Patch96: xen.migrate.tools_notify_restore_to_hangup_during_migration_--abort_if_busy.patch
# Upstream qemu patches
Patch100: VNC-Support-for-ExtendedKeyEvent-client-message.patch
# Our patches
@@ -395,7 +343,8 @@ Patch461: xen-migration-bridge-check.patch
Patch462: pygrub-netware-xnloader.patch
Patch463: xen-managed-pci-device.patch
Patch464: xend-hvm-firmware-passthrough.patch
Patch465: xen-glibc217.patch
Patch465: xend-cpuinfo-model-name.patch
Patch466: xen-glibc217.patch
# Jim's domain lock patch
Patch480: xend-domain-lock.patch
Patch481: xend-domain-lock-sfex.patch
@@ -406,9 +355,8 @@ Patch502: x86-cpufreq-report.patch
Patch503: x86-dom-print.patch
Patch504: pvdrv-import-shared-info.patch
Patch505: x86-extra-trap-info.patch
Patch506: x86-EFI-set-variable-permit-attrs.patch
Patch507: pvdrv_emulation_control.patch
Patch508: blktap-pv-cdrom.patch
Patch506: pvdrv_emulation_control.patch
Patch507: blktap-pv-cdrom.patch
Patch511: supported_module.diff
Patch512: magic_ioport_compat.patch
Patch513: xen.sles11sp1.fate311487.xen_platform_pci.dmistring.patch
@@ -418,6 +366,7 @@ Patch652: ioemu-disable-emulated-ide-if-pv.patch
Patch700: hv_extid_compatibility.patch
Patch800: xenpaging.autostart.patch
Patch801: xenpaging.doc.patch
Patch802: xenpaging.qemu.flush-cache.patch
# Build patch
Patch99998: tmp-initscript-modprobe.patch
Patch99999: tmp_build.patch
@@ -764,7 +713,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch25867 -p1
%patch25874 -p1
%patch25909 -p1
%patch25912 -p1
%patch25920 -p1
%patch25921 -p1
%patch25922 -p1
@@ -773,8 +721,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch25958 -p1
%patch25959 -p1
%patch25975 -p1
%patch26060 -p1
%patch26062 -p1
%patch26077 -p1
%patch26078 -p1
%patch26079 -p1
@@ -788,20 +734,8 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch26114 -p1
%patch26129 -p1
%patch26133 -p1
%patch26183 -p1
%patch26189 -p1
%patch26200 -p1
%patch26235 -p1
%patch26252 -p1
%patch26253 -p1
%patch26254 -p1
%patch26255 -p1
%patch26258 -p1
%patch26262 -p1
%patch26266 -p1
%patch26287 -p1
%patch26294 -p1
%patch26320 -p1
%patch26324 -p1
%patch26325 -p1
%patch26326 -p1
@@ -810,9 +744,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch26329 -p1
%patch26330 -p1
%patch26331 -p1
%patch26332 -p1
%patch26333 -p1
%patch26340 -p1
%patch26341 -p1
%patch26342 -p1
%patch26343 -p1
@@ -820,28 +751,9 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch26369 -p1
%patch26370 -p1
%patch26372 -p1
%patch26395 -p1
%patch26404 -p1
%patch26418 -p1
%patch26427 -p1
%patch26428 -p1
%patch26440 -p1
%patch26443 -p1
%patch34 -p1
%patch26444 -p1
%patch26468 -p1
%patch26469 -p1
%patch26501 -p1
%patch26502 -p1
%patch26516 -p1
%patch26517 -p1
%patch26518 -p1
%patch26519 -p1
%patch26526 -p1
%patch26529 -p1
%patch26531 -p1
%patch26532 -p1
%patch26536 -p1
%patch26547 -p1
%patch26548 -p1
%patch26549 -p1
@@ -852,35 +764,20 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch26556 -p1
%patch26576 -p1
%patch26577 -p1
%patch26578 -p1
%patch26585 -p1
%patch26595 -p1
%patch26601 -p1
%patch26656 -p1
%patch26659 -p1
%patch26660 -p1
%patch26672 -p1
%patch26673 -p1
%patch26675 -p1
%patch26676 -p1
%patch26677 -p1
%patch26678 -p1
%patch26679 -p1
%patch26683 -p1
%patch26686 -p1
%patch26689 -p1
%patch26692 -p1
%patch26702 -p1
%patch26704 -p1
%patch26731 -p1
%patch26733 -p1
%patch26734 -p1
%patch26736 -p1
%patch26737 -p1
%patch26742 -p1
%patch26743 -p1
%patch26744 -p1
%patch41 -p1
%patch26891 -p1
%patch26902 -p1
%patch26930 -p1
%patch4501 -p1
%patch4502 -p1
%patch4503 -p1
%patch4504 -p1
%patch4505 -p1
%patch4506 -p1
%patch4507 -p1
%patch4508 -p1
%patch48 -p1
%patch49 -p1
%patch88 -p1
%patch89 -p1
%patch90 -p1
@@ -889,7 +786,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch93 -p1
%patch94 -p1
%patch95 -p1
%patch96 -p1
# Qemu
%patch100 -p1
# Our patches
@@ -984,6 +880,7 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch463 -p1
%patch464 -p1
%patch465 -p1
%patch466 -p1
%patch480 -p1
%patch481 -p1
%patch500 -p1
@@ -994,7 +891,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch505 -p1
%patch506 -p1
%patch507 -p1
%patch508 -p1
%patch511 -p1
%patch512 -p1
%patch513 -p1
@@ -1004,6 +900,7 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch700 -p1
%patch800 -p1
%patch801 -p1
%patch802 -p1
%patch99998 -p1
%patch99999 -p1
# tools/qemu-xen-traditional-dir-remote/configure ./tools/qemu-xen-dir-remote/configure use
@@ -1134,6 +1031,10 @@ done
%if %{?with_dom0_support}0
# Stubdom
%if %{?with_stubdom}0
#remove -fstack-protector flag for stubdom build section
export EXTRA_CFLAGS_XEN_TOOLS=$(echo $RPM_OPT_FLAGS |sed -e 's/-fstack-protector//g')
export EXTRA_CFLAGS_QEMU_TRADITIONAL=$(echo $RPM_OPT_FLAGS |sed -e 's/-fstack-protector//g')
export EXTRA_CFLAGS_QEMU_XEN=$(echo $RPM_OPT_FLAGS |sed -e 's/-fstack-protector//g')
make stubdom %{?_smp_mflags}
make -C stubdom install \
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
@@ -1143,6 +1044,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/xen
ln -s /usr/lib/xen/bin/stubdom-dm $RPM_BUILD_ROOT/usr/lib64/xen/bin/stubdom-dm
ln -s /usr/lib/xen/bin/stubdompath.sh $RPM_BUILD_ROOT/usr/lib64/xen/bin/stubdompath.sh
%endif
#restore -fstack-protector flag
export EXTRA_CFLAGS_XEN_TOOLS="$RPM_OPT_FLAGS"
export EXTRA_CFLAGS_QEMU_TRADITIONAL="$RPM_OPT_FLAGS"
export EXTRA_CFLAGS_QEMU_XEN="$RPM_OPT_FLAGS"
%endif
# Qemu
#make -C tools/qemu-xen-dir-remote install