- Update to Xen 4.1.3 c/s 23336

- Upstream or pending upstream patches from Jan
  25587-fix-off-by-one-parsing-error.patch
  25616-x86-MCi_CTL-default.patch
  25617-vtd-qinval-addr.patch
  25688-x86-nr_irqs_gsi.patch
- bnc#773393 - VUL-0: CVE-2012-3433: xen: HVM guest destroy p2m
  teardown host DoS vulnerability
  CVE-2012-3433-xsa11.patch
- bnc#773401 - VUL-1: CVE-2012-3432: xen: HVM guest user mode MMIO
  emulation DoS
  25682-x86-inconsistent-io-state.patch

- bnc#762484 - VUL-1: CVE-2012-2625: xen: pv bootloader doesn't
  check the size of the bzip2 or lzma compressed kernel, leading to
  denial of service
  25589-pygrub-size-limits.patch

- Make it build with latest TeXLive 2012 with new package layout

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

xen.spec

@@ -15,13 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           xen
 ExclusiveArch:  %ix86 x86_64
 %define xvers 4.1
 %define xvermaj 4
-%define changeset 23174
-%define xen_build_dir xen-4.1.2-testing
+%define changeset 23336
+%define xen_build_dir xen-4.1.3-testing
 %define with_kmp 1
 %define with_stubdom 1
 # EFI requires gcc46 or newer
@@ -112,13 +111,13 @@ BuildRequires:  kernel-syms
 BuildRequires:  module-init-tools
 BuildRequires:  xorg-x11
 %endif
-Version:        4.1.2_17
+Version:        4.1.3_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.1.2-testing-src.tar.bz2
+Source0:        xen-4.1.3-testing-src.tar.bz2
 Source1:        stubdom.tar.bz2
 Source2:        xen-utils-0.1.tar.bz2
 Source3:        README.SuSE
@@ -175,17 +174,10 @@ Patch23128:     23128-xentrace_correct_formula_to_calculate_t_info_pages.patch
 Patch23129:     23129-xentrace_remove_unneeded_debug_printk.patch
 Patch23173:     23173-xentrace_Move_register_cpu_notifier_call_into_boot-time_init..patch
 Patch23199:     23199-amd-iommu-unmapped-intr-fault.patch
-Patch23233:     23233-hvm-cr-access.patch
-Patch23234:     23234-svm-decode-assist-base.patch
-Patch23235:     23235-svm-decode-assist-crs.patch
 Patch23236:     23236-svm-decode-assist-invlpg.patch
-Patch23238:     23238-svm-decode-assist-insn-fetch.patch
 Patch23239:     23239-xentrace_correct_overflow_check_for_number_of_per-cpu_trace_pages.patch
 Patch23246:     23246-x86-xsave-enable.patch
 Patch23303:     23303-cpufreq-misc.patch
-Patch23304:     23304-amd-oprofile-strings.patch
-Patch23305:     23305-amd-fam15-xenoprof.patch
-Patch23306:     23306-amd-fam15-vpmu.patch
 Patch23308:     23308-xentrace_Move_the_global_variable_t_info_first_offset_into_calculate_tbuf_size.patch
 Patch23309:     23309-xentrace_Mark_data_size___read_mostly_because_its_only_written_once.patch
 Patch23310:     23310-xentrace_Remove_unneeded_cast_when_assigning_pointer_value_to_dst.patch
@@ -195,13 +187,11 @@ Patch23404:     23404-xentrace_reduce_trace_buffer_size_to_something_mfn_offset_
 Patch23405:     23405-xentrace_fix_type_of_offset_to_avoid_ouf-of-bounds_access.patch
 Patch23406:     23406-xentrace_update___insert_record_to_copy_the_trace_record_to_individual_mfns.patch
 Patch23407:     23407-xentrace_allocate_non-contiguous_per-cpu_trace_buffers.patch
-Patch23437:     23437-amd-fam15-TSC-scaling.patch
 Patch23462:     23462-libxc-cpu-feature.patch
 Patch23506:     23506-x86_Disable_set_gpfn_from_mfn_until_m2p_table_is_allocated..patch
 Patch23507:     23507-xenpaging_update_machine_to_phys_mapping_during_page_deallocation.patch
 Patch23508:     23508-vmx-proc-based-ctls-probe.patch
 Patch23509:     23509-x86_32_Fix_build_Define_machine_to_phys_mapping_valid.patch
-Patch23511:     23511-amd-fam15-no-flush-for-C3.patch
 Patch23562:     23562-xenpaging_remove_unused_spinlock_in_pager.patch
 Patch23571:     23571-vtd-fault-verbosity.patch
 Patch23574:     23574-x86-dom0-compressed-ELF.patch
@@ -229,90 +219,59 @@ Patch23595:     23595-xenpaging_add_watch_thread_to_catch_guest_shutdown.patch
 Patch23596:     23596-xenpaging_implement_stopping_of_pager_by_sending_SIGTERM-SIGINT.patch
 Patch23597:     23597-xenpaging_remove_private_mem_event.h.patch
 Patch23599:     23599-tools_fix_build_after_recent_xenpaging_changes.patch
-Patch23610:     23610-x86-topology-info.patch
-Patch23611:     23611-amd-fam15-topology.patch
 Patch23613:     23613-EFI-headers.patch
 Patch23614:     23614-x86_64-EFI-boot.patch
 Patch23615:     23615-x86_64-EFI-runtime.patch
 Patch23616:     23616-x86_64-EFI-MPS.patch
 Patch23643:     23643-xentrace_Allow_tracing_to_be_enabled_at_boot.patch
 Patch23676:     23676-x86_64-image-map-bounds.patch
-Patch23686:     23686-pygrub-solaris.patch
 Patch23697:     23697-pygrub-grub2.patch
 Patch23719:     23719-xentrace_update___trace_var_comment.patch
 Patch23723:     23723-x86-CMOS-lock.patch
-Patch23724:     23724-x86-smpboot-x2apic.patch
-Patch23726:     23726-x86-intel-flexmigration-v2.patch
 Patch23735:     23735-guest-dom0-cap.patch
 Patch23747:     23747-mmcfg-base-address.patch
 Patch23749:     23749-mmcfg-reservation.patch
-Patch23752:     23752-x86-shared-IRQ-vector-maps.patch
-Patch23754:     23754-AMD-perdev-vector-map.patch
 Patch23771:     23771-x86-ioapic-clear-pin.patch
 Patch23772:     23772-x86-trampoline.patch
 Patch23774:     23774-x86_64-EFI-EDD.patch
-Patch23781:     23781-pm-wide-ACPI-ids.patch
 Patch23782:     23782-x86-ioapic-clear-irr.patch
 Patch23783:     23783-ACPI-set-_PDC-bits.patch
-Patch23795:     23795-intel-ich10-quirk.patch
 Patch23800:     23800-x86_64-guest-addr-range.patch
 Patch23804:     23804-x86-IPI-counts.patch
 Patch23817:     23817-mem_event_add_ref_counting_for_free_requestslots.patch
 Patch23818:     23818-mem_event_use_mem_event_mark_and_pause_in_mem_event_check_ring.patch
-Patch23819:     23819-make-docs.patch
 Patch23827:     23827-xenpaging_use_batch_of_pages_during_final_page-in.patch
 Patch23841:     23841-mem_event_pass_mem_event_domain_pointer_to_mem_event_functions.patch
 Patch23842:     23842-mem_event_use_different_ringbuffers_for_share_paging_and_access.patch
-Patch23853:     23853-x86-pv-cpuid-xsave.patch
 Patch23874:     23874-xenpaging_track_number_of_paged_pages_in_struct_domain.patch
 Patch23897:     23897-x86-mce-offline-again.patch
-Patch23900:     23900-xzalloc.patch
 Patch23904:     23904-xenpaging_use_p2m-get_entry_in_p2m_mem_paging_functions.patch
 Patch23905:     23905-xenpaging_fix_locking_in_p2m_mem_paging_functions.patch
 Patch23906:     23906-xenpaging_remove_confusing_comment_from_p2m_mem_paging_populate.patch
-Patch23908:     23908-p2m_query-modify_p2mt_with_p2m_lock_held.patch
-Patch23925:     23925-x86-AMD-ARAT-Fam12.patch
 Patch23933:     23933-pt-bus2bridge-update.patch
 Patch23943:     23943-xenpaging_clear_page_content_after_evict.patch
 Patch23944:     23944-pygrub-debug.patch
 Patch23949:     23949-constify_vcpu_set_affinitys_second_parameter.patch
 Patch23953:     23953-xenpaging_handle_evict_failures.patch
-Patch23955:     23955-x86-pv-cpuid-xsave.patch
 Patch23957:     23957-cpufreq-error-paths.patch
 Patch23978:     23978-xenpaging_check_p2mt_in_p2m_mem_paging_functions.patch
 Patch23979:     23979-xenpaging_document_p2m_mem_paging_functions.patch
 Patch23980:     23980-xenpaging_disallow_paging_in_a_PoD_guest.patch
 Patch23993:     23993-x86-microcode-amd-fix-23871.patch
-Patch23998:     23998-pygrub-GPT.patch
 Patch23999:     23999-pygrub-grub2.patch
-Patch24000:     24000-pygrub-grub2.patch
-Patch24001:     24001-pygrub-grub2.patch
-Patch24002:     24002-pygrub-grub2.patch
 Patch24064:     24064-pygrub-HybridISO.patch
 Patch24104:     24104-waitqueue_Double_size_of_x86_shadow_stack..patch
 Patch24105:     24105-xenpaging_compare_domain_pointer_in_p2m_mem_paging_populate.patch
 Patch24106:     24106-mem_event_check_capabilities_only_once.patch
-Patch24116:     24116-x86-continuation-cancel.patch
 Patch24123:     24123-x86-cpuidle-quiesce.patch
 Patch24124:     24124-x86-microcode-amd-quiesce.patch
-Patch24137:     24137-revert-23666.patch
 Patch24138:     24138-xenpaging_munmap_all_pages_after_page-in.patch
-Patch24144:     24144-cpufreq-turbo-crash.patch
-Patch24148:     24148-shadow-pgt-dying-op-performance.patch
 Patch24153:     24153-x86-emul-feature-checks.patch
-Patch24155:     24155-x86-ioapic-EOI-after-migration.patch
-Patch24156:     24156-x86-ioapic-shared-vectors.patch
-Patch24157:     24157-x86-xstate-init.patch
-Patch24168:     24168-x86-vioapic-clear-remote_irr.patch
 Patch24171:     24171-x86waitqueue_Allocate_whole_page_for_shadow_stack..patch
 Patch24178:     24178-debug_Add_domain-vcpu_pause_count_info_to_d_key..patch
-Patch24189:     24189-x86-p2m-pod-locking.patch
-Patch24190:     24190-hap-log-dirty-disable-rc.patch
-Patch24193:     24193-hap-track-dirty-vram-rc.patch
 Patch24195:     24195-waitqueue_Detect_saved-stack_overflow_and_crash_the_guest..patch
 Patch24196:     24196-waitqueue_Reorder_prepare_to_wait_so_that_vcpu_is_definitely_on_the.patch
 Patch24197:     24197-x86-waitqueue_Because_we_have_per-cpu_stacks_we_must_wake_up_on_teh.patch
-Patch24201:     24201-x86-pcpu-platform-op.patch
 Patch24208:     24208-xenpaging_remove_filename_from_comment.patch
 Patch24209:     24209-xenpaging_remove_obsolete_comment_in_resume_path.patch
 Patch24210:     24210-xenpaging_use_PERROR_to_print_errno.patch
@@ -335,81 +294,53 @@ Patch24226:     24226-xenpaging_add_debug_to_show_received_watch_event..patch
 Patch24227:     24227-xenpaging_restrict_pagefile_permissions.patch
 Patch24231:     24231-waitqueue_Implement_wake_up_nroneall..patch
 Patch24232:     24232-waitqueue_Hold_a_reference_to_a_domain_on_a_waitqueue..patch
-Patch24261:     24261-x86-cpuidle-Westmere-EX.patch
 Patch24269:     24269-mem_event_move_mem_event_domain_out_of_struct_domain.patch
 Patch24270:     24270-Free_d-mem_event_on_domain_destruction..patch
 Patch24272:     24272-xenpaging_Fix_c-s_235070a29c8c3ddf7_update_machine_to_phys_mapping_during_page_deallocation.patch
 Patch24275:     24275-x86-emul-lzcnt.patch
 Patch24277:     24277-x86-dom0-features.patch
 Patch24278:     24278-x86-dom0-no-PCID.patch
-Patch24282:     24282-x86-log-dirty-bitmap-leak.patch
 Patch24318:     24318-x86-mm_Fix_checks_during_foreign_mapping_of_paged_pages.patch
-Patch24344:     24344-tools-x86_64_Fix_cpuid_inline_asm_to_not_clobber_stacks_red_zone.patch
 Patch24327:     24327-After_preparing_a_page_for_page-in_allow_immediate_fill-in_of_the_page_contents.patch
 Patch24328:     24328-Tools_Libxc_wrappers_to_automatically_fill_in_page_oud_page_contents_on_prepare.patch
 Patch24329:     24329-Teach_xenpaging_to_use_the_new_and_non-racy_xc_mem_paging_load_interface.patch
-Patch24357:     24357-firmware-no-_PS0-_PS3.patch
-Patch24358:     24358-kexec-compat-overflow.patch
 Patch24359:     24359-x86-domU-features.patch
 Patch24360:     24360-x86-pv-domU-no-PCID.patch
-Patch24389:     24389-amd-fam10-gart-tlb-walk-err.patch
 Patch24391:     24391-x86-pcpu-version.patch
 Patch24401:     24401-pygrub-scrolling.patch
 Patch24402:     24402-pygrub-edit-fix.patch
-Patch24411:     24411-x86-ucode-AMD-Fam15.patch
-Patch24412:     24412-x86-AMD-errata-model-shift.patch
-Patch24417:     24417-amd-erratum-573.patch
-Patch24429:     24429-mceinj-tool.patch
-Patch24447:     24447-x86-TXT-INIT-SIPI-delay.patch
-Patch24448:     24448-x86-pt-irq-leak.patch
-Patch24453:     24453-x86-vIRQ-IRR-TMR-race.patch
-Patch24456:     24456-x86-emul-lea.patch
 Patch24459:     24459-libxl-vifname.patch
-Patch24460:     24460-pygrub-extlinux.patch
 Patch24466:     24466-libxc_Only_retry_mapping_pages_when_ENOENT_is_returned.patch
 Patch24478:     24478-libxl_add_feature_flag_to_xenstore_for_XS_RESET_WATCHES.patch
-Patch24517:     24517-VT-d-fault-softirq.patch
-Patch24527:     24527-AMD-Vi-fault-softirq.patch
-Patch24535:     24535-x86-vMSI-misc.patch
 Patch24566:     24566-tools-libxc_fix_error_handling_in_xc_mem_paging_load.patch
 Patch24586:     24586-x86-mm_Properly_account_for_paged_out_pages.patch
 Patch24609:     24609-tools-libxc_handle_fallback_in_linux_privcmd_map_foreign_bulk_properly.patch
 Patch24610:     24610-xenpaging_make_file_op_largefile_aware.patch
-Patch24615:     24615-VESA-lfb-flush.patch
-Patch24690:     24690-x86-PCI-SERR-no-deadlock.patch
-Patch24701:     24701-gnttab-map-grant-ref-recovery.patch
 Patch24706:     24706-pygrub-extlinux.patch
-Patch24742:     24742-gnttab-misc.patch
 Patch24780:     24780-x86-paging-use-clear_guest.patch
 Patch24781:     24781-x86-vmce-mcg_ctl.patch
 Patch24805:     24805-x86-MSI-X-dom0-ro.patch
-Patch24883:     24883-x86-guest-walk-not-present.patch
 Patch24886:     24886-x86-vmce-mcg_ctl-default.patch
 Patch24887:     24887-x86-vmce-sr.patch
-Patch24888:     24888-pci-release-devices.patch
-Patch24950:     24950-gnttab-copy-mapped.patch
-Patch24970:     24970-x86-cpuidle-deny-port-access.patch
-Patch24996:     24996-x86-cpuidle-array-overrun.patch
 Patch25041:     25041-tapdisk2-create-init-name.patch
-Patch25098:     25098-x86-emul-lock-UD.patch
-Patch25101:     25101-x86-hpet-disable.patch
-Patch25168:     25168-x86-memset-size.patch
-Patch25191:     25191-x86-tdt-delta-calculation.patch
-Patch25195:     25195-x86-cpuidle-C2-no-flush-or-bm-check.patch
 Patch25196:     25196-x86-HAP-PAT-sr.patch
-Patch25200:     25200-x86_64-trap-bounce-flags.patch
-Patch25242:     25242-x86_64-hotplug-compat-m2p.patch
 Patch25247:     25247-SVM-no-rdtsc-intercept.patch
 Patch25267:     25267-x86-text-unlikely.patch
 Patch25269:     25269-x86-vMCE-addr-misc-write.patch
-Patch25271:     25271-x86_64-IST-index.patch
-Patch25327:     25327-pvdrv-no-asm-system-h.patch
+Patch25382:     25382-x86-masked-MCE-masking-NMI.patch
+Patch25387:     25387-amd-iommu-workaround-73x.patch
+Patch25430:     25430-x86-AMD-Fam15-reenable-topoext.patch
+Patch25431:     25431-x86-EDD-MBR-sig-check.patch
+Patch25459:     25459-page-list-splice.patch
+Patch25479:     25479-x86-boot-trampoline-remove.patch
+Patch25485:     25485-x86_64-canonical-checks.patch
+Patch25589:     25589-pygrub-size-limits.patch
+Patch25616:     25616-x86-MCi_CTL-default.patch
 # Upstream qemu patches
 Patch100:       ioemu-9868-MSI-X.patch
 Patch101:       ioemu-9869-MSI-X-init.patch
 Patch102:       ioemu-9873-MSI-X-fix-unregister_iomem.patch
 Patch103:       ioemu-9877-MSI-X-device-cleanup.patch
-Patch104:       cve-2012-0029-qemu-xen-unstable.patch
 # Our patches
 Patch300:       xen-config.diff
 Patch301:       xend-config.diff
@@ -467,8 +398,7 @@ Patch378:       log-guest-console.patch
 Patch379:       xend-migration-domname-fix.patch
 Patch380:       xm-create-maxmem.patch
 Patch381:       vif-bridge-tap-fix.patch
-Patch382:       xencommons-xenstored-root.patch
-Patch383:       xend-cpuid.patch
+Patch382:       xend-cpuid.patch
 # Patches for snapshot support
 Patch400:       snapshot-ioemu-save.patch
 Patch401:       snapshot-ioemu-restore.patch
@@ -535,17 +465,13 @@ Patch505:       pvdrv-import-shared-info.patch
 Patch507:       x86-extra-trap-info.patch
 Patch508:       pvdrv_emulation_control.patch
 Patch509:       blktap-pv-cdrom.patch
-Patch510:       pv-driver-build.patch
-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
+Patch510:       supported_module.diff
+Patch511:       magic_ioport_compat.patch
+Patch512:       xen.sles11sp1.fate311487.xen_platform_pci.dmistring.patch
 Patch650:       disable_emulated_device.diff
 Patch651:       ioemu-disable-scsi.patch
 Patch652:       ioemu-disable-emulated-ide-if-pv.patch
-Patch653:       x86_64-sysret-canonical.patch
-Patch654:       x86_64-AMD-erratum-121.patch
-Patch655:       x86_64-allow-unsafe-adjust.patch
+Patch653:       x86_64-allow-unsafe-adjust.patch
 Patch700:       hv_extid_compatibility.patch
 Patch701:       xen.no-default-runlevel-4.patch
 # FATE 310510
@@ -570,7 +496,6 @@ Patch1142:      xenpaging.qemu.flush-cache.patch
 # xenalyze
 Patch20000:     xenalyze.gcc46.patch
 # Build patch
-Patch99997:     xen-optimize.patch
 Patch99998:     tmp-initscript-modprobe.patch
 Patch99999:     tmp_build.patch
 Url:            http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
@@ -927,17 +852,10 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch23129 -p1
 %patch23173 -p1
 %patch23199 -p1
-%patch23233 -p1
-%patch23234 -p1
-%patch23235 -p1
 %patch23236 -p1
-%patch23238 -p1
 %patch23239 -p1
 %patch23246 -p1
 %patch23303 -p1
-%patch23304 -p1
-%patch23305 -p1
-%patch23306 -p1
 %patch23308 -p1
 %patch23309 -p1
 %patch23310 -p1
@@ -947,13 +865,11 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch23405 -p1
 %patch23406 -p1
 %patch23407 -p1
-%patch23437 -p1
 %patch23462 -p1
 %patch23506 -p1
 %patch23507 -p1
 %patch23508 -p1
 %patch23509 -p1
-%patch23511 -p1
 %patch23562 -p1
 %patch23571 -p1
 %patch23574 -p1
@@ -981,90 +897,59 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch23596 -p1
 %patch23597 -p1
 %patch23599 -p1
-%patch23610 -p1
-%patch23611 -p1
 %patch23613 -p1
 %patch23614 -p1
 %patch23615 -p1
 %patch23616 -p1
 %patch23643 -p1
 %patch23676 -p1
-%patch23686 -p1
 %patch23697 -p1
 %patch23719 -p1
 %patch23723 -p1
-%patch23724 -p1
-%patch23726 -p1
 %patch23735 -p1
 %patch23747 -p1
 %patch23749 -p1
-%patch23752 -p1
-%patch23754 -p1
 %patch23771 -p1
 %patch23772 -p1
 %patch23774 -p1
-%patch23781 -p1
 %patch23782 -p1
 %patch23783 -p1
-%patch23795 -p1
 %patch23800 -p1
 %patch23804 -p1
 %patch23817 -p1
 %patch23818 -p1
-%patch23819 -p1
 %patch23827 -p1
 %patch23841 -p1
 %patch23842 -p1
-%patch23853 -p1
 %patch23874 -p1
 %patch23897 -p1
-%patch23900 -p1
 %patch23904 -p1
 %patch23905 -p1
 %patch23906 -p1
-%patch23908 -p1
-%patch23925 -p1
 %patch23933 -p1
 %patch23943 -p1
 %patch23944 -p1
 %patch23949 -p1
 %patch23953 -p1
-%patch23955 -p1
 %patch23957 -p1
 %patch23978 -p1
 %patch23979 -p1
 %patch23980 -p1
 %patch23993 -p1
-%patch23998 -p1
 %patch23999 -p1
-%patch24000 -p1
-%patch24001 -p1
-%patch24002 -p1
 %patch24064 -p1
 %patch24104 -p1
 %patch24105 -p1
 %patch24106 -p1
-%patch24116 -p1
 %patch24123 -p1
 %patch24124 -p1
-%patch24137 -p1
 %patch24138 -p1
-%patch24144 -p1
-%patch24148 -p1
 %patch24153 -p1
-%patch24155 -p1
-%patch24156 -p1
-%patch24157 -p1
-%patch24168 -p1
 %patch24171 -p1
 %patch24178 -p1
-%patch24189 -p1
-%patch24190 -p1
-%patch24193 -p1
 %patch24195 -p1
 %patch24196 -p1
 %patch24197 -p1
-%patch24201 -p1
 %patch24208 -p1
 %patch24209 -p1
 %patch24210 -p1
@@ -1087,81 +972,53 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch24227 -p1
 %patch24231 -p1
 %patch24232 -p1
-%patch24261 -p1
 %patch24269 -p1
 %patch24270 -p1
 %patch24272 -p1
 %patch24275 -p1
 %patch24277 -p1
 %patch24278 -p1
-%patch24282 -p1
 %patch24318 -p1
-%patch24344 -p1
 %patch24327 -p1
 %patch24328 -p1
 %patch24329 -p1
-%patch24357 -p1
-%patch24358 -p1
 %patch24359 -p1
 %patch24360 -p1
-%patch24389 -p1
 %patch24391 -p1
 %patch24401 -p1
 %patch24402 -p1
-%patch24411 -p1
-%patch24412 -p1
-%patch24417 -p1
-%patch24429 -p1
-%patch24447 -p1
-%patch24448 -p1
-%patch24453 -p1
-%patch24456 -p1
 %patch24459 -p1
-%patch24460 -p1
 %patch24466 -p1
 %patch24478 -p1
-%patch24517 -p1
-%patch24527 -p1
-%patch24535 -p1
 %patch24566 -p1
 %patch24586 -p1
 %patch24609 -p1
 %patch24610 -p1
-%patch24615 -p1
-%patch24690 -p1
-%patch24701 -p1
 %patch24706 -p1
-%patch24742 -p1
 %patch24780 -p1
 %patch24781 -p1
 %patch24805 -p1
-%patch24883 -p1
 %patch24886 -p1
 %patch24887 -p1
-%patch24888 -p1
-%patch24950 -p1
-%patch24970 -p1
-%patch24996 -p1
 %patch25041 -p1
-%patch25098 -p1
-%patch25101 -p1
-%patch25168 -p1
-%patch25191 -p1
-%patch25195 -p1
 %patch25196 -p1
-%patch25200 -p1
-%patch25242 -p1
 %patch25247 -p1
 %patch25267 -p1
 %patch25269 -p1
-%patch25271 -p1
-%patch25327 -p1
+%patch25382 -p1
+%patch25387 -p1
+%patch25430 -p1
+%patch25431 -p1
+%patch25459 -p1
+%patch25479 -p1
+%patch25485 -p1
+%patch25589 -p1
+%patch25616 -p1
 # Qemu
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1
 # Our patches
 %patch300 -p1
 %patch301 -p1
@@ -1219,7 +1076,6 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch380 -p1
 %patch381 -p1
 %patch382 -p1
-%patch383 -p1
 %patch400 -p1
 %patch401 -p1
 %patch402 -p1
@@ -1284,14 +1140,10 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch510 -p1
 %patch511 -p1
 %patch512 -p1
-%patch513 -p1
-%patch514 -p1
 %patch650 -p1
 %patch651 -p1
 %patch652 -p1
 %patch653 -p1
-%patch654 -p1
-%patch655 -p1
 %patch700 -p1
 %patch701 -p1
 # FATE 310510
@@ -1314,7 +1166,6 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch1137 -p1
 %patch1142 -p1
 #
-%patch99997 -p1
 %patch99998 -p1
 %patch99999 -p1