Olaf Hering
b9d38dfc8d
- 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
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
# HG changeset patch
|
|
# User Jan Beulich <jbeulich@suse.com>
|
|
# Date 1358427591 -3600
|
|
# Node ID 76598d4bf61ef0c575deba539ff99078c80e651e
|
|
# Parent 0dee85c061addb7124d77c5f6cfe2ea7bc03b760
|
|
x86: handle both NMI kinds if they occur simultaneously
|
|
|
|
We shouldn't assume PCI SERR excludes IOCHK.
|
|
|
|
Once at it, also remove the doubly redundant range restriction on
|
|
"reason" - the variable already is "unsigned char".
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
Index: xen-4.2.2-testing/xen/arch/x86/traps.c
|
|
===================================================================
|
|
--- xen-4.2.2-testing.orig/xen/arch/x86/traps.c
|
|
+++ xen-4.2.2-testing/xen/arch/x86/traps.c
|
|
@@ -3369,10 +3369,10 @@ void do_nmi(struct cpu_user_regs *regs)
|
|
reason = inb(0x61);
|
|
if ( reason & 0x80 )
|
|
pci_serr_error(regs);
|
|
- else if ( reason & 0x40 )
|
|
+ if ( reason & 0x40 )
|
|
io_check_error(regs);
|
|
- else if ( !nmi_watchdog )
|
|
- unknown_nmi_error(regs, (unsigned char)(reason&0xff));
|
|
+ if ( !(reason & 0xc0) && !nmi_watchdog )
|
|
+ unknown_nmi_error(regs, reason);
|
|
}
|
|
}
|
|
|