From 898ade9d0eff730b063118e600975a7375321f8e2e76262eada0c036f0d95481 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 14 Jan 2013 17:52:04 +0000 Subject: [PATCH] - bnc#787169 - L3: Marvell 88SE9125 disk controller not detecting disk in Xen kernel 26133-IOMMU-defer-BM-disable.patch 26324-IOMMU-assign-params.patch 26325-IOMMU-add-remove-params.patch 26326-VT-d-context-map-params.patch 26327-AMD-IOMMU-flush-params.patch 26328-IOMMU-pdev-type.patch 26329-IOMMU-phantom-dev.patch 26330-VT-d-phantom-MSI.patch 26331-IOMMU-phantom-dev-quirk.patch - Upstream patches from Jan 26294-x86-AMD-Fam15-way-access-filter.patch 26320-IOMMU-domctl-assign-seg.patch 26332-x86-compat-show-guest-stack-mfn.patch 26333-x86-get_page_type-assert.patch - bnc#794316 - VUL-0: CVE-2012-5634: xen: VT-d interrupt remapping source validation flaw (XSA-33) CVE-2012-5634-xsa33.patch - Update to Xen 4.2.1 c/s 25952 - Upstream patches from Jan 26195-x86-compat-atp-gmfn-range-cont.patch 26196-ACPI-set-PDC-bits-rc.patch 26200-IOMMU-debug-verbose.patch 26203-x86-HAP-dirty-vram-leak.patch 26229-gnttab-version-switch.patch (Replaces CVE-2012-5510-xsa26.patch) 26230-x86-HVM-limit-batches.patch (Replaces CVE-2012-5511-xsa27.patch) OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=220 --- 25861-x86-early-fixmap.patch | 48 ++++--- 25952-x86-MMIO-remap-permissions.patch | 8 +- 25957-x86-TSC-adjust-HVM.patch | 24 ++-- bdrv_open2_flags_2.patch | 6 +- blktap.patch | 2 +- cdrom-removable.patch | 4 +- change-vnc-passwd.patch | 2 +- ioemu-disable-emulated-ide-if-pv.patch | 15 +-- qemu-xen-dir-remote.tar.bz2 | 4 +- qemu-xen-traditional-dir-remote.tar.bz2 | 4 +- seabios-dir-remote.tar.bz2 | 4 +- tools-watchdog-support.patch | 4 +- xen-fixme-doc.diff | 2 +- xen-qemu-iscsi-fix.patch | 2 +- xen-xmexample.diff | 2 +- xen.changes | 64 +++++++++ xen.spec | 172 ++++++++---------------- 17 files changed, 194 insertions(+), 173 deletions(-) diff --git a/25861-x86-early-fixmap.patch b/25861-x86-early-fixmap.patch index 32eae6f..991a615 100644 --- a/25861-x86-early-fixmap.patch +++ b/25861-x86-early-fixmap.patch @@ -12,8 +12,10 @@ the fixmaps together with other boot time page table construction. Signed-off-by: Jan Beulich Acked-by: Keir Fraser ---- a/xen/arch/x86/boot/head.S -+++ b/xen/arch/x86/boot/head.S +Index: xen-4.2.0-testing/xen/arch/x86/boot/head.S +=================================================================== +--- xen-4.2.0-testing.orig/xen/arch/x86/boot/head.S ++++ xen-4.2.0-testing/xen/arch/x86/boot/head.S @@ -3,6 +3,7 @@ #include #include @@ -55,8 +57,10 @@ Acked-by: Keir Fraser #endif /* Initialize 4kB mappings of first 2MB or 4MB of memory. */ ---- a/xen/arch/x86/efi/boot.c -+++ b/xen/arch/x86/efi/boot.c +Index: xen-4.2.0-testing/xen/arch/x86/efi/boot.c +=================================================================== +--- xen-4.2.0-testing.orig/xen/arch/x86/efi/boot.c ++++ xen-4.2.0-testing/xen/arch/x86/efi/boot.c @@ -17,6 +17,9 @@ #include #include @@ -88,8 +92,10 @@ Acked-by: Keir Fraser /* Initialise L3 boot-map page directory entries. */ l3_bootmap[l3_table_offset(xen_phys_start)] = l3e_from_paddr((UINTN)l2_bootmap, __PAGE_HYPERVISOR); ---- a/xen/arch/x86/mm.c -+++ b/xen/arch/x86/mm.c +Index: xen-4.2.0-testing/xen/arch/x86/mm.c +=================================================================== +--- xen-4.2.0-testing.orig/xen/arch/x86/mm.c ++++ xen-4.2.0-testing/xen/arch/x86/mm.c @@ -130,6 +130,10 @@ l1_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) l1_identmap[L1_PAGETABLE_ENTRIES]; @@ -101,8 +107,10 @@ Acked-by: Keir Fraser #define MEM_LOG(_f, _a...) gdprintk(XENLOG_WARNING , _f "\n" , ## _a) /* ---- a/xen/arch/x86/x86_64/mm.c -+++ b/xen/arch/x86/x86_64/mm.c +Index: xen-4.2.0-testing/xen/arch/x86/x86_64/mm.c +=================================================================== +--- xen-4.2.0-testing.orig/xen/arch/x86/x86_64/mm.c ++++ xen-4.2.0-testing/xen/arch/x86/x86_64/mm.c @@ -65,6 +65,10 @@ l3_pgentry_t __attribute__ ((__section__ l2_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) l2_xenmap[L2_PAGETABLE_ENTRIES]; @@ -114,9 +122,11 @@ Acked-by: Keir Fraser /* Enough page directories to map into the bottom 1GB. */ l3_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) l3_bootmap[L3_PAGETABLE_ENTRIES]; ---- a/xen/include/asm-x86/config.h -+++ b/xen/include/asm-x86/config.h -@@ -315,7 +315,7 @@ extern unsigned char boot_edid_info[128] +Index: xen-4.2.0-testing/xen/include/asm-x86/config.h +=================================================================== +--- xen-4.2.0-testing.orig/xen/include/asm-x86/config.h ++++ xen-4.2.0-testing/xen/include/asm-x86/config.h +@@ -317,7 +317,7 @@ extern unsigned char boot_edid_info[128] #define MACHPHYS_MBYTES 16 /* 1 MB needed per 1 GB memory */ #define FRAMETABLE_MBYTES (MACHPHYS_MBYTES * 6) @@ -125,8 +135,10 @@ Acked-by: Keir Fraser #define IOREMAP_VIRT_START (IOREMAP_VIRT_END - (IOREMAP_MBYTES<<20)) #define DIRECTMAP_VIRT_END IOREMAP_VIRT_START #define DIRECTMAP_VIRT_START (DIRECTMAP_VIRT_END - (DIRECTMAP_MBYTES<<20)) ---- a/xen/include/asm-x86/fixmap.h -+++ b/xen/include/asm-x86/fixmap.h +Index: xen-4.2.0-testing/xen/include/asm-x86/fixmap.h +=================================================================== +--- xen-4.2.0-testing.orig/xen/include/asm-x86/fixmap.h ++++ xen-4.2.0-testing/xen/include/asm-x86/fixmap.h @@ -13,12 +13,17 @@ #define _ASM_FIXMAP_H @@ -161,8 +173,10 @@ Acked-by: Keir Fraser +#endif /* __ASSEMBLY__ */ + #endif ---- a/xen/include/asm-x86/page.h -+++ b/xen/include/asm-x86/page.h +Index: xen-4.2.0-testing/xen/include/asm-x86/page.h +=================================================================== +--- xen-4.2.0-testing.orig/xen/include/asm-x86/page.h ++++ xen-4.2.0-testing/xen/include/asm-x86/page.h @@ -1,6 +1,8 @@ #ifndef __X86_PAGE_H__ #define __X86_PAGE_H__ @@ -189,8 +203,10 @@ Acked-by: Keir Fraser void paging_init(void); void setup_idle_pagetable(void); #endif /* !defined(__ASSEMBLY__) */ +Index: xen-4.2.0-testing/xen/include/xen/const.h +=================================================================== --- /dev/null -+++ b/xen/include/xen/const.h ++++ xen-4.2.0-testing/xen/include/xen/const.h @@ -0,0 +1,24 @@ +/* const.h: Macros for dealing with constants. */ + diff --git a/25952-x86-MMIO-remap-permissions.patch b/25952-x86-MMIO-remap-permissions.patch index 91a44dd..d28e54a 100644 --- a/25952-x86-MMIO-remap-permissions.patch +++ b/25952-x86-MMIO-remap-permissions.patch @@ -17,9 +17,11 @@ domain's permission is sufficient. Signed-off-by: Daniel De Graaf Committed-by: Jan Beulich ---- a/xen/arch/x86/mm.c -+++ b/xen/arch/x86/mm.c -@@ -870,6 +870,19 @@ get_page_from_l1e( +Index: xen-4.2.0-testing/xen/arch/x86/mm.c +=================================================================== +--- xen-4.2.0-testing.orig/xen/arch/x86/mm.c ++++ xen-4.2.0-testing/xen/arch/x86/mm.c +@@ -883,6 +883,19 @@ get_page_from_l1e( return -EINVAL; } diff --git a/25957-x86-TSC-adjust-HVM.patch b/25957-x86-TSC-adjust-HVM.patch index 451605e..d1f3b06 100644 --- a/25957-x86-TSC-adjust-HVM.patch +++ b/25957-x86-TSC-adjust-HVM.patch @@ -24,8 +24,10 @@ would be happy when sync tsc. Signed-off-by: Liu, Jinsong Committed-by: Jan Beulich ---- a/xen/arch/x86/hvm/hvm.c -+++ b/xen/arch/x86/hvm/hvm.c +Index: xen-4.2.0-testing/xen/arch/x86/hvm/hvm.c +=================================================================== +--- xen-4.2.0-testing.orig/xen/arch/x86/hvm/hvm.c ++++ xen-4.2.0-testing/xen/arch/x86/hvm/hvm.c @@ -244,6 +244,7 @@ int hvm_set_guest_pat(struct vcpu *v, u6 void hvm_set_guest_tsc(struct vcpu *v, u64 guest_tsc) { @@ -70,7 +72,7 @@ Committed-by: Jan Beulich void hvm_migrate_timers(struct vcpu *v) { rtc_migrate_timers(v); -@@ -2794,6 +2812,10 @@ int hvm_msr_read_intercept(unsigned int +@@ -2798,6 +2816,10 @@ int hvm_msr_read_intercept(unsigned int *msr_content = hvm_get_guest_tsc(v); break; @@ -81,7 +83,7 @@ Committed-by: Jan Beulich case MSR_TSC_AUX: *msr_content = hvm_msr_tsc_aux(v); break; -@@ -2907,6 +2929,10 @@ int hvm_msr_write_intercept(unsigned int +@@ -2911,6 +2933,10 @@ int hvm_msr_write_intercept(unsigned int hvm_set_guest_tsc(v, msr_content); break; @@ -92,7 +94,7 @@ Committed-by: Jan Beulich case MSR_TSC_AUX: v->arch.hvm_vcpu.msr_tsc_aux = (uint32_t)msr_content; if ( cpu_has_rdtscp -@@ -3478,6 +3504,8 @@ void hvm_vcpu_reset_state(struct vcpu *v +@@ -3482,6 +3508,8 @@ void hvm_vcpu_reset_state(struct vcpu *v v->domain->vcpu[0]->arch.hvm_vcpu.cache_tsc_offset; hvm_funcs.set_tsc_offset(v, v->arch.hvm_vcpu.cache_tsc_offset); @@ -101,8 +103,10 @@ Committed-by: Jan Beulich paging_update_paging_modes(v); v->arch.flags |= TF_kernel_mode; ---- a/xen/include/asm-x86/hvm/vcpu.h -+++ b/xen/include/asm-x86/hvm/vcpu.h +Index: xen-4.2.0-testing/xen/include/asm-x86/hvm/vcpu.h +=================================================================== +--- xen-4.2.0-testing.orig/xen/include/asm-x86/hvm/vcpu.h ++++ xen-4.2.0-testing/xen/include/asm-x86/hvm/vcpu.h @@ -137,6 +137,7 @@ struct hvm_vcpu { struct hvm_vcpu_asid n1asid; @@ -111,8 +115,10 @@ Committed-by: Jan Beulich /* VPMU */ struct vpmu_struct vpmu; ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h +Index: xen-4.2.0-testing/xen/include/asm-x86/msr-index.h +=================================================================== +--- xen-4.2.0-testing.orig/xen/include/asm-x86/msr-index.h ++++ xen-4.2.0-testing/xen/include/asm-x86/msr-index.h @@ -284,6 +284,7 @@ #define MSR_IA32_PLATFORM_ID 0x00000017 #define MSR_IA32_EBL_CR_POWERON 0x0000002a diff --git a/bdrv_open2_flags_2.patch b/bdrv_open2_flags_2.patch index d9f1c24..dbf5c29 100644 --- a/bdrv_open2_flags_2.patch +++ b/bdrv_open2_flags_2.patch @@ -67,6 +67,6 @@ Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c continue; - if (bdrv_open2(bs, danger_buf, BDRV_O_CACHE_WB /* snapshot and write-back */, &bdrv_raw) == 0) { + if (bdrv_open2(bs, danger_buf, flags|BDRV_O_CACHE_WB /* snapshot and write-back */, &bdrv_raw) == 0) { - pstrcpy(bs->filename, sizeof(bs->filename), params); - } - #else + if (pasprintf(&buf, "%s/params", bpath) == -1) + continue; + free(params); diff --git a/blktap.patch b/blktap.patch index 7d504cb..6ab25d4 100644 --- a/blktap.patch +++ b/blktap.patch @@ -45,7 +45,7 @@ Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c /* read the name of the device */ if (pasprintf(&buf, "%s/dev", bpath) == -1) continue; -@@ -775,6 +783,7 @@ void xenstore_parse_domain_config(int hv +@@ -777,6 +785,7 @@ void xenstore_parse_domain_config(int hv free(mode); free(params); free(dev); diff --git a/cdrom-removable.patch b/cdrom-removable.patch index 9048020..2bfd107 100644 --- a/cdrom-removable.patch +++ b/cdrom-removable.patch @@ -431,7 +431,7 @@ Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c /* check if it is a cdrom */ if (danger_type && !strcmp(danger_type, "cdrom")) { bdrv_set_type_hint(bs, BDRV_TYPE_CDROM); -@@ -1028,6 +1044,50 @@ static void xenstore_process_vcpu_set_ev +@@ -1030,6 +1046,50 @@ static void xenstore_process_vcpu_set_ev return; } @@ -482,7 +482,7 @@ Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c void xenstore_process_event(void *opaque) { char **vec, *offset, *bpath = NULL, *buf = NULL, *drv = NULL, *image = NULL; -@@ -1063,6 +1123,11 @@ void xenstore_process_event(void *opaque +@@ -1065,6 +1125,11 @@ void xenstore_process_event(void *opaque xenstore_watch_callbacks[i].cb(vec[XS_WATCH_TOKEN], xenstore_watch_callbacks[i].opaque); diff --git a/change-vnc-passwd.patch b/change-vnc-passwd.patch index 5d5bbfa..97d1f15 100644 --- a/change-vnc-passwd.patch +++ b/change-vnc-passwd.patch @@ -39,7 +39,7 @@ Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c struct xs_handle *xsh = NULL; static char *media_filename[MAX_DRIVES+1]; static QEMUTimer *insert_timer = NULL; -@@ -937,6 +938,19 @@ static void xenstore_process_dm_command_ +@@ -939,6 +940,19 @@ static void xenstore_process_dm_command_ } else if (!strncmp(command, "continue", len)) { fprintf(logfile, "dm-command: continue after state save\n"); xen_pause_requested = 0; diff --git a/ioemu-disable-emulated-ide-if-pv.patch b/ioemu-disable-emulated-ide-if-pv.patch index 4415743..4aa9cef 100644 --- a/ioemu-disable-emulated-ide-if-pv.patch +++ b/ioemu-disable-emulated-ide-if-pv.patch @@ -49,24 +49,23 @@ Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c { char **e_danger = NULL; char *buf = NULL; -@@ -733,15 +733,19 @@ void xenstore_parse_domain_config(int hv +@@ -739,11 +739,19 @@ void xenstore_parse_domain_config(int hv #endif - drives_table[nb_drives].bdrv = bs; - drives_table[nb_drives].used = 1; +- media_filename[nb_drives] = strdup(bs->filename); +- nb_drives++; +- + if (machine == &xenfv_machine) { + drives_table[nb_drives].bdrv = bs; + drives_table[nb_drives].used = 1; - #ifdef CONFIG_STUBDOM -- media_filename[nb_drives] = strdup(danger_buf); ++#ifdef CONFIG_STUBDOM + media_filename[nb_drives] = strdup(danger_buf); - #else -- media_filename[nb_drives] = strdup(bs->filename); ++#else + media_filename[nb_drives] = strdup(bs->filename); - #endif -- nb_drives++; -- ++#endif + nb_drives++; + } else { + qemu_aio_flush(); diff --git a/qemu-xen-dir-remote.tar.bz2 b/qemu-xen-dir-remote.tar.bz2 index b51fd48..ce5051e 100644 --- a/qemu-xen-dir-remote.tar.bz2 +++ b/qemu-xen-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fe1ff40b8f0305a2911bbf8701096facb6a47f23d2deffb19b22aea9739c81d -size 5111353 +oid sha256:e5ba8bcd20390c3773e1e0a3a82c46896af5fb73ec235d27c250ef028212aa7a +size 5111823 diff --git a/qemu-xen-traditional-dir-remote.tar.bz2 b/qemu-xen-traditional-dir-remote.tar.bz2 index 09dc5f5..7c66574 100644 --- a/qemu-xen-traditional-dir-remote.tar.bz2 +++ b/qemu-xen-traditional-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79d607307935499aca9fa7ddaea37dd9f7f767695b9feb3f25ee9a4a181ccbd9 -size 3212153 +oid sha256:dfe4a381b86b68e85ea70f6306914cd7e3f9debb7df3797a611f339054042528 +size 3212536 diff --git a/seabios-dir-remote.tar.bz2 b/seabios-dir-remote.tar.bz2 index e0c8adc..e714d2a 100644 --- a/seabios-dir-remote.tar.bz2 +++ b/seabios-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9569ad2cae31a65caeb17e9b517220f0c18d7165bed1b1412217fcff15c59aef -size 356387 +oid sha256:880675bae5305039066c25101305a7854d6d336980ba00dbbbe005a4c23e7126 +size 356438 diff --git a/tools-watchdog-support.patch b/tools-watchdog-support.patch index 7a9f344..82853e5 100644 --- a/tools-watchdog-support.patch +++ b/tools-watchdog-support.patch @@ -116,7 +116,7 @@ Index: xen-4.2.0-testing/tools/libxl/libxl_types.idl =================================================================== --- xen-4.2.0-testing.orig/tools/libxl/libxl_types.idl +++ xen-4.2.0-testing/tools/libxl/libxl_types.idl -@@ -319,6 +319,8 @@ libxl_domain_build_info = Struct("domain +@@ -320,6 +320,8 @@ libxl_domain_build_info = Struct("domain ("usbdevice", string), ("soundhw", string), ("xen_platform_pci", libxl_defbool), @@ -129,7 +129,7 @@ Index: xen-4.2.0-testing/tools/libxl/xl_cmdimpl.c =================================================================== --- xen-4.2.0-testing.orig/tools/libxl/xl_cmdimpl.c +++ xen-4.2.0-testing/tools/libxl/xl_cmdimpl.c -@@ -1405,6 +1405,8 @@ skip_vfb: +@@ -1412,6 +1412,8 @@ skip_vfb: xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw, 0); xlu_cfg_get_defbool(config, "xen_platform_pci", &b_info->u.hvm.xen_platform_pci, 0); diff --git a/xen-fixme-doc.diff b/xen-fixme-doc.diff index 6227469..d6ef07d 100644 --- a/xen-fixme-doc.diff +++ b/xen-fixme-doc.diff @@ -2,7 +2,7 @@ Index: xen-4.2.0-testing/docs/man/xmdomain.cfg.pod.5 =================================================================== --- xen-4.2.0-testing.orig/docs/man/xmdomain.cfg.pod.5 +++ xen-4.2.0-testing/docs/man/xmdomain.cfg.pod.5 -@@ -335,16 +335,10 @@ at hda1, which is the root filesystem. +@@ -333,16 +333,10 @@ at hda1, which is the root filesystem. =item I diff --git a/xen-qemu-iscsi-fix.patch b/xen-qemu-iscsi-fix.patch index f888eff..e5782c9 100644 --- a/xen-qemu-iscsi-fix.patch +++ b/xen-qemu-iscsi-fix.patch @@ -61,7 +61,7 @@ Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c /* Obtain blktap sub-type prefix */ if ((!strcmp(drv, "tap") || !strcmp(drv, "qdisk")) && params[0]) { char *offset = strchr(params, ':'); -@@ -657,6 +681,12 @@ void xenstore_parse_domain_config(int hv +@@ -663,6 +687,12 @@ void xenstore_parse_domain_config(int hv format = &bdrv_host_device; else format = &bdrv_raw; diff --git a/xen-xmexample.diff b/xen-xmexample.diff index 2ed9d18..e3715b2 100644 --- a/xen-xmexample.diff +++ b/xen-xmexample.diff @@ -213,7 +213,7 @@ Index: xen-4.2.0-testing/docs/man/xmdomain.cfg.pod.5 many Linux distros you will not need a ramdisk if using the default xen kernel. -@@ -323,14 +323,14 @@ configured. They should not be consider +@@ -321,14 +321,14 @@ configured. They should not be consider =item I diff --git a/xen.changes b/xen.changes index 99db64c..6731dba 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Tue Jan 8 11:06:04 MST 2013 - carnold@novell.com + +- bnc#787169 - L3: Marvell 88SE9125 disk controller not detecting + disk in Xen kernel + 26133-IOMMU-defer-BM-disable.patch + 26324-IOMMU-assign-params.patch + 26325-IOMMU-add-remove-params.patch + 26326-VT-d-context-map-params.patch + 26327-AMD-IOMMU-flush-params.patch + 26328-IOMMU-pdev-type.patch + 26329-IOMMU-phantom-dev.patch + 26330-VT-d-phantom-MSI.patch + 26331-IOMMU-phantom-dev-quirk.patch +- Upstream patches from Jan + 26294-x86-AMD-Fam15-way-access-filter.patch + 26320-IOMMU-domctl-assign-seg.patch + 26332-x86-compat-show-guest-stack-mfn.patch + 26333-x86-get_page_type-assert.patch + +------------------------------------------------------------------- +Mon Dec 17 11:20:47 MST 2012 - carnold@novell.com + +- bnc#794316 - VUL-0: CVE-2012-5634: xen: VT-d interrupt remapping + source validation flaw (XSA-33) + CVE-2012-5634-xsa33.patch + +------------------------------------------------------------------- +Mon Dec 17 11:15:17 MST 2012 - carnold@novell.com + +- Update to Xen 4.2.1 c/s 25952 + +------------------------------------------------------------------- +Tue Dec 11 10:14:11 MST 2012 - carnold@novell.com + +- Upstream patches from Jan + 26195-x86-compat-atp-gmfn-range-cont.patch + 26196-ACPI-set-PDC-bits-rc.patch + 26200-IOMMU-debug-verbose.patch + 26203-x86-HAP-dirty-vram-leak.patch + 26229-gnttab-version-switch.patch (Replaces CVE-2012-5510-xsa26.patch) + 26230-x86-HVM-limit-batches.patch (Replaces CVE-2012-5511-xsa27.patch) + 26231-memory-exchange-checks.patch (Replaces CVE-2012-5513-xsa29.patch) + 26232-x86-mark-PoD-error-path.patch (Replaces CVE-2012-5514-xsa30.patch) + 26233-memop-order-checks.patch (Replaces CVE-2012-5515-xsa31.patch) + 26234-x86-page-from-gfn-pv.patch (Replaces CVE-2012-5525-xsa32.patch) + 26235-IOMMU-ATS-max-queue-depth.patch + 26252-VMX-nested-rflags.patch + 26253-VMX-nested-rdtsc.patch + 26254-VMX-nested-dr.patch + 26255-VMX-nested-ia32e-mode.patch + 26258-VMX-nested-intr-delivery.patch + 26260-x86-mmuext-errors.patch + 26262-x86-EFI-secure-shim.patch + 26266-sched-ratelimit-check.patch + 26272-x86-EFI-makefile-cflags-filter.patch + +------------------------------------------------------------------- +Mon Dec 10 14:21:14 MST 2012 - carnold@novell.com + +- bnc#757525 - domain destroyed on live migration with missing vif + on target machine + xen-migration-bridge-check.patch + ------------------------------------------------------------------- Thu Dec 6 10:56:26 MST 2012 - carnold@novell.com diff --git a/xen.spec b/xen.spec index 6d02f15..379e34c 100644 --- a/xen.spec +++ b/xen.spec @@ -1,7 +1,7 @@ # # spec file for package xen # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -19,8 +19,8 @@ Name: xen ExclusiveArch: %ix86 x86_64 %define xvers 4.2 %define xvermaj 4 -%define changeset 25844 -%define xen_build_dir xen-4.2.0-testing +%define changeset 25952 +%define xen_build_dir xen-4.2.1-testing %define with_kmp 1 %define with_stubdom 1 # EFI requires gcc46 or newer @@ -114,13 +114,13 @@ BuildRequires: kernel-syms BuildRequires: module-init-tools BuildRequires: xorg-x11 %endif -Version: 4.2.0_04 +Version: 4.2.1_02 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.0-testing-src.tar.bz2 +Source0: xen-4.2.1-testing-src.tar.bz2 Source1: stubdom.tar.bz2 Source2: qemu-xen-traditional-dir-remote.tar.bz2 Source3: qemu-xen-dir-remote.tar.bz2 @@ -163,20 +163,6 @@ Source99: baselibs.conf # http://xenbits.xensource.com/ext/xenalyze Source20000: xenalyze.hg.tar.bz2 # Upstream patches -Patch25833: 25833-32on64-bogus-pt_base-adjust.patch -Patch25835: 25835-adjust-rcu-lock-domain.patch -Patch25836: 25836-VT-d-S3-MSI-resume.patch -Patch25850: 25850-tmem-xsa-15-1.patch -Patch25851: 25851-tmem-xsa-15-2.patch -Patch25852: 25852-tmem-xsa-15-3.patch -Patch25853: 25853-tmem-xsa-15-4.patch -Patch25854: 25854-tmem-xsa-15-5.patch -Patch25855: 25855-tmem-xsa-15-6.patch -Patch25856: 25856-tmem-xsa-15-7.patch -Patch25857: 25857-tmem-xsa-15-8.patch -Patch25858: 25858-tmem-xsa-15-9.patch -Patch25859: 25859-tmem-missing-break.patch -Patch25860: 25860-tmem-cleanup.patch Patch25861: 25861-x86-early-fixmap.patch Patch25862: 25862-sercon-non-com.patch Patch25863: 25863-sercon-ehci-dbgp.patch @@ -188,33 +174,12 @@ Patch25909: 25909-xenpm-consistent.patch Patch25920: 25920-x86-APICV-enable.patch Patch25921: 25921-x86-APICV-delivery.patch Patch25922: 25922-x86-APICV-x2APIC.patch -Patch25927: 25927-x86-domctl-ioport-mapping-range.patch -Patch25929: 25929-tmem-restore-pool-version.patch -Patch25931: 25931-x86-domctl-iomem-mapping-checks.patch -Patch25940: 25940-x86-S3-flush-cache.patch -Patch25941: 25941-pygrub_always_append_--args.patch Patch25952: 25952-x86-MMIO-remap-permissions.patch Patch25957: 25957-x86-TSC-adjust-HVM.patch Patch25958: 25958-x86-TSC-adjust-sr.patch Patch25959: 25959-x86-TSC-adjust-expose.patch -Patch25961: 25961-x86-HPET-interrupts.patch -Patch25962: 25962-x86-assign-irq-vector-old.patch -Patch25965: 25965-x86-ucode-Intel-resume.patch Patch25975: 25975-x86-IvyBridge.patch -Patch25984: 25984-SVM-nested-paging-mode.patch -Patch26006: 26006-hotplug-Linux_Remove_tracing_bash_-x_from_network-nat_script.patch -Patch26007: 26007-xenballoond.init_remove_4_from_default_runlevel.patch -Patch26008: 26008-xend-pvscsi_fix_passing_of_SCSI_control_LUNs.patch -Patch26009: 26009-xend-pvscsi_fix_usage_of_persistant_device_names_for_SCSI_devices.patch -Patch26010: 26010-xend-pvscsi_update_sysfs_parser_for_Linux_3.0.patch -Patch26011: 26011-stubdom_fix_parallel_build_by_expanding_CROSS_MAKE.patch -Patch26018: 26018-pygrub_correct_typo_in_--args_assignment.patch -Patch26054: 26054-x86-AMD-perf-ctr-init.patch -Patch26055: 26055-x86-oprof-hvm-mode.patch -Patch26056: 26056-page-alloc-flush-filter.patch -Patch26061: 26061-x86-oprof-counter-range.patch Patch26062: 26062-ACPI-ERST-move-data.patch -Patch26063: 26063-x86-HPET-affinity-lock.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 @@ -225,32 +190,33 @@ Patch26084: 26084-hotplug_install_hotplugpath.sh_as_data_file.patch Patch26085: 26085-stubdom_install_stubdompath.sh_as_data_file.patch Patch26086: 26086-hotplug-Linux_correct_sysconfig_tag_in_xendomains.patch Patch26087: 26087-hotplug-Linux_install_sysconfig_files_as_data_files.patch -Patch26088: 26088-tools_xend_fix_wrong_condition_check_for_xml_file.patch -Patch26093: 26093-HVM-PoD-grant-mem-type.patch -Patch26095: 26095-SVM-nested-leak.patch -Patch26096: 26096-SVM-nested-vmexit-emul.patch -Patch26098: 26098-perfc-build.patch -Patch26102: 26102-x86-IOAPIC-legacy-not-first.patch Patch26114: 26114-pygrub-list-entries.patch Patch26129: 26129-ACPI-BGRT-invalidate.patch -Patch26132: 26132-tmem-save-NULL-check.patch -Patch26134: 26134-x86-shadow-invlpg-check.patch -Patch26139: 26139-cpumap-masking.patch -Patch26148: 26148-vcpu-timer-overflow.patch -Patch26149: 26149-x86-p2m-physmap-error-path.patch -Patch26150: 26150-x86-shadow-unhook-toplevel-check.patch -Patch26151: 26151-gnttab-compat-get-status-frames.patch -Patch26179: 26179-PCI-find-next-cap.patch +Patch26133: 26133-IOMMU-defer-BM-disable.patch Patch26183: 26183-x86-HPET-masking.patch -Patch26188: 26188-x86-time-scale-asm.patch Patch26189: 26189-xenstore-chmod.patch -Patch25: CVE-2012-4544-xsa25.patch -Patch26: CVE-2012-5510-xsa26.patch -Patch27: CVE-2012-5511-xsa27.patch -Patch29: CVE-2012-5513-xsa29.patch -Patch30: CVE-2012-5514-xsa30.patch -Patch31: CVE-2012-5515-xsa31.patch -Patch32: CVE-2012-5525-xsa32.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 +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 +Patch26327: 26327-AMD-IOMMU-flush-params.patch +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 +Patch33: CVE-2012-5634-xsa33.patch # Upstream qemu patches Patch100: VNC-Support-for-ExtendedKeyEvent-client-message.patch # Our patches @@ -345,6 +311,7 @@ Patch459: blktap-close-fifos.patch Patch460: blktap-disable-debug-printf.patch Patch461: xen-glibc217.patch Patch462: reverse-24757-use-grant-references.patch +Patch463: xen-migration-bridge-check.patch # Jim's domain lock patch Patch480: xend-domain-lock.patch Patch481: xend-domain-lock-sfex.patch @@ -704,20 +671,6 @@ Authors %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 # Upstream patches -%patch25833 -p1 -%patch25835 -p1 -%patch25836 -p1 -%patch25850 -p1 -%patch25851 -p1 -%patch25852 -p1 -%patch25853 -p1 -%patch25854 -p1 -%patch25855 -p1 -%patch25856 -p1 -%patch25857 -p1 -%patch25858 -p1 -%patch25859 -p1 -%patch25860 -p1 %patch25861 -p1 %patch25862 -p1 %patch25863 -p1 @@ -729,33 +682,12 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools %patch25920 -p1 %patch25921 -p1 %patch25922 -p1 -%patch25927 -p1 -%patch25929 -p1 -%patch25931 -p1 -%patch25940 -p1 -%patch25941 -p1 %patch25952 -p1 %patch25957 -p1 %patch25958 -p1 %patch25959 -p1 -%patch25961 -p1 -%patch25962 -p1 -%patch25965 -p1 %patch25975 -p1 -%patch25984 -p1 -%patch26006 -p1 -%patch26007 -p1 -%patch26008 -p1 -%patch26009 -p1 -%patch26010 -p1 -%patch26011 -p1 -%patch26018 -p1 -%patch26054 -p1 -%patch26055 -p1 -%patch26056 -p1 -%patch26061 -p1 %patch26062 -p1 -%patch26063 -p1 %patch26077 -p1 %patch26078 -p1 %patch26079 -p1 @@ -766,32 +698,33 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools %patch26085 -p1 %patch26086 -p1 %patch26087 -p1 -%patch26088 -p1 -%patch26093 -p1 -%patch26095 -p1 -%patch26096 -p1 -%patch26098 -p1 -%patch26102 -p1 %patch26114 -p1 %patch26129 -p1 -%patch26132 -p1 -%patch26134 -p1 -%patch26139 -p1 -%patch26148 -p1 -%patch26149 -p1 -%patch26150 -p1 -%patch26151 -p1 -%patch26179 -p1 +%patch26133 -p1 %patch26183 -p1 -%patch26188 -p1 %patch26189 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 +%patch26200 -p1 +%patch26235 -p1 +%patch26252 -p1 +%patch26253 -p1 +%patch26254 -p1 +%patch26255 -p1 +%patch26258 -p1 +%patch26262 -p1 +%patch26266 -p1 +%patch26294 -p1 +%patch26320 -p1 +%patch26324 -p1 +%patch26325 -p1 +%patch26326 -p1 +%patch26327 -p1 +%patch26328 -p1 +%patch26329 -p1 +%patch26330 -p1 +%patch26331 -p1 +%patch26332 -p1 +%patch26333 -p1 +%patch33 -p1 # Qemu %patch100 -p1 # Our patches @@ -883,6 +816,7 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools %patch460 -p1 %patch461 -p1 %patch462 -p1 +%patch463 -p1 %patch480 -p1 %patch481 -p1 %patch500 -p1