ac6e56e6d7
23900-xzalloc.patch 24144-cpufreq-turbo-crash.patch 24148-shadow-pgt-dying-op-performance.patch 24155-x86-ioapic-EOI-after-migration.patch 24156-x86-ioapic-shared-vectors.patch 24157-x86-xstate-init.patch 24168-x86-vioapic-clear-remote_irr.patch - submit fixes for bnc#649209 and bnc#711892 xl-create-pv-with-qcow2-img.patch update suspend_evtchn_lock.patch - Update trace.c, merge patches from upstream 23050-xentrace_dynamic_tracebuffer_allocation.patch 23091-xentrace_fix_t_info_pages_calculation..patch 23092-xentrace_print_calculated_numbers_in_calculate_tbuf_size.patch 23093-xentrace_remove_gdprintk_usage_since_they_are_not_in_guest_context.patch 23094-xentrace_update_comments.patch 23095-xentrace_use_consistent_printk_prefix.patch 23128-xentrace_correct_formula_to_calculate_t_info_pages.patch 23129-xentrace_remove_unneeded_debug_printk.patch 23173-xentrace_Move_register_cpu_notifier_call_into_boot-time_init..patch 23239-xentrace_correct_overflow_check_for_number_of_per-cpu_trace_pages.patch 23308-xentrace_Move_the_global_variable_t_info_first_offset_into_calculate_tbuf_size.patch 23309-xentrace_Mark_data_size___read_mostly_because_its_only_written_once.patch 23310-xentrace_Remove_unneeded_cast_when_assigning_pointer_value_to_dst.patch 23404-xentrace_reduce_trace_buffer_size_to_something_mfn_offset_can_reach.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=160
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
changeset: 23091:67632e5cf652
|
|
user: Olaf Hering <olaf@aepfle.de>
|
|
date: Fri Mar 25 08:56:33 2011 +0000
|
|
files: xen/common/trace.c
|
|
description:
|
|
xentrace: fix t_info_pages calculation.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
|
|
---
|
|
xen/common/trace.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
Index: xen-4.1.2-testing/xen/common/trace.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/xen/common/trace.c
|
|
+++ xen-4.1.2-testing/xen/common/trace.c
|
|
@@ -29,6 +29,7 @@
|
|
#include <xen/init.h>
|
|
#include <xen/mm.h>
|
|
#include <xen/percpu.h>
|
|
+#include <xen/pfn.h>
|
|
#include <xen/cpu.h>
|
|
#include <asm/atomic.h>
|
|
#include <public/sysctl.h>
|
|
@@ -109,6 +110,7 @@ static int calculate_tbuf_size(unsigned
|
|
{
|
|
struct t_buf dummy;
|
|
typeof(dummy.prod) size;
|
|
+ unsigned int t_info_words, t_info_bytes;
|
|
|
|
/* force maximum value for an unsigned type */
|
|
size = -1;
|
|
@@ -122,11 +124,9 @@ static int calculate_tbuf_size(unsigned
|
|
pages = size;
|
|
}
|
|
|
|
- t_info_pages = num_online_cpus() * pages + t_info_first_offset;
|
|
- t_info_pages *= sizeof(uint32_t);
|
|
- t_info_pages /= PAGE_SIZE;
|
|
- if ( t_info_pages % PAGE_SIZE )
|
|
- t_info_pages++;
|
|
+ t_info_words = num_online_cpus() * pages + t_info_first_offset;
|
|
+ t_info_bytes = t_info_words * sizeof(uint32_t);
|
|
+ t_info_pages = PFN_UP(t_info_bytes);
|
|
return pages;
|
|
}
|
|
|