b244ce9e91
sles10. Patch pygrub to get the kernel and initrd from the image. pygrub-boot-legacy-sles.patch - bnc#842515 - VUL-0: CVE-2013-4375: XSA-71: xen: qemu disk backend (qdisk) resource leak CVE-2013-4375-xsa71.patch - Upstream patches from Jan 52496bea-x86-properly-handle-hvm_copy_from_guest_-phys-virt-errors.patch (Replaces CVE-2013-4355-xsa63.patch) 52496c11-x86-mm-shadow-Fix-initialization-of-PV-shadow-L4-tables.patch (Replaces CVE-2013-4356-xsa64.patch) 52496c32-x86-properly-set-up-fbld-emulation-operand-address.patch (Replaces CVE-2013-4361-xsa66.patch) 52497c6c-x86-don-t-blindly-create-L3-tables-for-the-direct-map.patch 524e971b-x86-idle-Fix-get_cpu_idle_time-s-interaction-with-offline-pcpus.patch 524e9762-x86-percpu-Force-INVALID_PERCPU_AREA-to-non-canonical.patch 524e983e-Nested-VMX-check-VMX-capability-before-read-VMX-related-MSRs.patch 524e98b1-Nested-VMX-fix-IA32_VMX_CR4_FIXED1-msr-emulation.patch 524e9dc0-xsm-forbid-PV-guest-console-reads.patch 5256a979-x86-check-segment-descriptor-read-result-in-64-bit-OUTS-emulation.patch 5256be57-libxl-fix-vif-rate-parsing.patch 5256be84-tools-ocaml-fix-erroneous-free-of-cpumap-in-stub_xc_vcpu_getaffinity.patch 5256be92-libxl-fix-out-of-memory-error-handling-in-libxl_list_cpupool.patch 5257a89a-x86-correct-LDT-checks.patch 5257a8e7-x86-add-address-validity-check-to-guest_map_l1e.patch 5257a944-x86-check-for-canonical-address-before-doing-page-walks.patch 525b95f4-scheduler-adjust-internal-locking-interface.patch 525b9617-sched-fix-race-between-sched_move_domain-and-vcpu_wake.patch 525e69e8-credit-unpause-parked-vcpu-before-destroying-it.patch 525faf5e-x86-print-relevant-tail-part-of-filename-for-warnings-and-crashes.patch - bnc#840196 - L3: MTU size on Dom0 gets reset when booting DomU OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=276
78 lines
2.7 KiB
Diff
78 lines
2.7 KiB
Diff
# Commit f72cb6bbc10348f4f7671428e5db509731e9e6a5
|
|
# Date 2013-10-17 11:35:26 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86: print relevant (tail) part of filename for warnings and crashes
|
|
|
|
In particular when the origin construct is in a header file (and
|
|
hence the file name is an absolute path instead of just the file name
|
|
portion) the information can otherwise become rather useless when the
|
|
build tree isn't sitting relatively close to the file system root.
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Acked-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/arch/x86/traps.c
|
|
+++ b/xen/arch/x86/traps.c
|
|
@@ -953,7 +953,7 @@ void do_invalid_op(struct cpu_user_regs
|
|
{
|
|
struct bug_frame bug;
|
|
struct bug_frame_str bug_str;
|
|
- const char *p, *filename, *predicate, *eip = (char *)regs->eip;
|
|
+ const char *p, *prefix = "", *filename, *predicate, *eip = (char *)regs->eip;
|
|
unsigned long fixup;
|
|
int id, lineno;
|
|
|
|
@@ -995,12 +995,19 @@ void do_invalid_op(struct cpu_user_regs
|
|
}
|
|
|
|
/* WARN, BUG or ASSERT: decode the filename pointer and line number. */
|
|
- filename = p;
|
|
+ fixup = strlen(p);
|
|
+ if ( fixup > 50 )
|
|
+ {
|
|
+ filename = p + fixup - 47;
|
|
+ prefix = "...";
|
|
+ }
|
|
+ else
|
|
+ filename = p;
|
|
lineno = bug.id >> 2;
|
|
|
|
if ( id == BUGFRAME_warn )
|
|
{
|
|
- printk("Xen WARN at %.50s:%d\n", filename, lineno);
|
|
+ printk("Xen WARN at %s%s:%d\n", prefix, filename, lineno);
|
|
show_execution_state(regs);
|
|
regs->eip = (unsigned long)eip;
|
|
return;
|
|
@@ -1008,10 +1015,10 @@ void do_invalid_op(struct cpu_user_regs
|
|
|
|
if ( id == BUGFRAME_bug )
|
|
{
|
|
- printk("Xen BUG at %.50s:%d\n", filename, lineno);
|
|
+ printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno);
|
|
DEBUGGER_trap_fatal(TRAP_invalid_op, regs);
|
|
show_execution_state(regs);
|
|
- panic("Xen BUG at %.50s:%d\n", filename, lineno);
|
|
+ panic("Xen BUG at %s%s:%d\n", prefix, filename, lineno);
|
|
}
|
|
|
|
/* ASSERT: decode the predicate string pointer. */
|
|
@@ -1025,12 +1032,12 @@ void do_invalid_op(struct cpu_user_regs
|
|
|
|
if ( !is_kernel(predicate) )
|
|
predicate = "<unknown>";
|
|
- printk("Assertion '%s' failed at %.50s:%d\n",
|
|
- predicate, filename, lineno);
|
|
+ printk("Assertion '%s' failed at %s%s:%d\n",
|
|
+ predicate, prefix, filename, lineno);
|
|
DEBUGGER_trap_fatal(TRAP_invalid_op, regs);
|
|
show_execution_state(regs);
|
|
- panic("Assertion '%s' failed at %.50s:%d\n",
|
|
- predicate, filename, lineno);
|
|
+ panic("Assertion '%s' failed at %s%s:%d\n",
|
|
+ predicate, prefix, filename, lineno);
|
|
|
|
die:
|
|
if ( (fixup = search_exception_table(regs->eip)) != 0 )
|