# HG changeset patch
# User sos22@xxxxxxxxxxxxxxxxxxxx
# Node ID 5b004f4e76cf90ef6f7155a4822e63b9e33cf7d8
# Parent bd6ae7117cca102a946fa73dcbaa1324a0b9f3b6
# Parent ac04112c45b9f51fa6548efc142b14bed202ced8
Merge.
Signed-off-by: Steven Smith, sos22@xxxxxxxxx
diff -r bd6ae7117cca -r 5b004f4e76cf xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Wed Jan 25 22:31:07 2006
+++ b/xen/arch/x86/mm.c Wed Jan 25 22:35:22 2006
@@ -1826,8 +1826,7 @@
break;
case MMUEXT_NEW_BASEPTR:
- if (shadow_mode_translate(current->domain))
- mfn = __gpfn_to_mfn(current->domain, mfn);
+ mfn = __gpfn_to_mfn(current->domain, mfn);
okay = new_guest_cr3(mfn);
percpu_info[cpu].deferred_ops &= ~DOP_FLUSH_TLB;
break;
@@ -2679,10 +2678,9 @@
long do_set_gdt(unsigned long *frame_list, unsigned int entries)
{
- int nr_pages = (entries + 511) / 512;
+ int i, nr_pages = (entries + 511) / 512;
unsigned long frames[16];
long ret;
- int x;
/* Rechecked in set_gdt, but ensures a sane limit for copy_from_user(). */
if ( entries > FIRST_RESERVED_GDT_ENTRY )
@@ -2691,10 +2689,8 @@
if ( copy_from_user(frames, frame_list, nr_pages * sizeof(unsigned long)) )
return -EFAULT;
- if (shadow_mode_translate(current->domain)) {
- for (x = 0; x < nr_pages; x++)
- frames[x] = __gpfn_to_mfn(current->domain, frames[x]);
- }
+ for ( i = 0; i < nr_pages; i++ )
+ frames[i] = __gpfn_to_mfn(current->domain, frames[i]);
LOCK_BIGLOCK(current->domain);
diff -r bd6ae7117cca -r 5b004f4e76cf xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S Wed Jan 25 22:31:07 2006
+++ b/xen/arch/x86/x86_32/entry.S Wed Jan 25 22:35:22 2006
@@ -478,13 +478,13 @@
.previous
domain_crash_synchronous_string:
- .asciz "domain_crash_sync from entry.S %lx\n"
-
+ .asciz "domain_crash_sync called from entry.S (%lx)\n"
+
domain_crash_synchronous:
- pushl $domain_crash_synchronous_string
- call printf
- jmp __domain_crash_synchronous
-
+ pushl $domain_crash_synchronous_string
+ call printf
+ jmp __domain_crash_synchronous
+
ALIGN
process_guest_exception_and_events:
leal VCPU_trap_bounce(%ebx),%edx
diff -r bd6ae7117cca -r 5b004f4e76cf xen/arch/x86/x86_64/entry.S
--- a/xen/arch/x86/x86_64/entry.S Wed Jan 25 22:31:07 2006
+++ b/xen/arch/x86/x86_64/entry.S Wed Jan 25 22:35:22 2006
@@ -436,6 +436,14 @@
.quad FLT12,domain_crash_synchronous , FLT13,domain_crash_synchronous
.previous
+domain_crash_synchronous_string:
+ .asciz "domain_crash_sync called from entry.S\n"
+
+domain_crash_synchronous:
+ leaq domain_crash_synchronous_string(%rip),%rdi
+ call printf
+ jmp __domain_crash_synchronous
+
ALIGN
/* %rbx: struct vcpu */
process_guest_exception_and_events:
diff -r bd6ae7117cca -r 5b004f4e76cf xen/include/xen/sched.h
--- a/xen/include/xen/sched.h Wed Jan 25 22:31:07 2006
+++ b/xen/include/xen/sched.h Wed Jan 25 22:35:22 2006
@@ -240,7 +240,7 @@
*/
extern void __domain_crash(struct domain *d);
#define domain_crash(d) do { \
- printf("domain_crash called from %s:%d\n", __FILE__, __LINE__); \
+ printk("domain_crash called from %s:%d\n", __FILE__, __LINE__); \
__domain_crash(d); \
} while (0)
@@ -250,7 +250,7 @@
*/
extern void __domain_crash_synchronous(void) __attribute__((noreturn));
#define domain_crash_synchronous() do { \
- printf("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__); \
+ printk("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__); \
__domain_crash_synchronous(); \
} while (0)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home