direct-io.hg

changeset 8666:5b004f4e76cf

Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk
author sos22@douglas.cl.cam.ac.uk
date Wed Jan 25 23:35:22 2006 +0100 (2006-01-25)
parents bd6ae7117cca ac04112c45b9
children eb364ce00a24
files
line diff
     1.1 --- a/xen/arch/x86/mm.c	Wed Jan 25 23:31:07 2006 +0100
     1.2 +++ b/xen/arch/x86/mm.c	Wed Jan 25 23:35:22 2006 +0100
     1.3 @@ -1826,8 +1826,7 @@ int do_mmuext_op(
     1.4              break;
     1.5  
     1.6          case MMUEXT_NEW_BASEPTR:
     1.7 -            if (shadow_mode_translate(current->domain))
     1.8 -                mfn = __gpfn_to_mfn(current->domain, mfn);
     1.9 +            mfn = __gpfn_to_mfn(current->domain, mfn);
    1.10              okay = new_guest_cr3(mfn);
    1.11              percpu_info[cpu].deferred_ops &= ~DOP_FLUSH_TLB;
    1.12              break;
    1.13 @@ -2679,10 +2678,9 @@ long set_gdt(struct vcpu *v,
    1.14  
    1.15  long do_set_gdt(unsigned long *frame_list, unsigned int entries)
    1.16  {
    1.17 -    int nr_pages = (entries + 511) / 512;
    1.18 +    int i, nr_pages = (entries + 511) / 512;
    1.19      unsigned long frames[16];
    1.20      long ret;
    1.21 -    int x;
    1.22  
    1.23      /* Rechecked in set_gdt, but ensures a sane limit for copy_from_user(). */
    1.24      if ( entries > FIRST_RESERVED_GDT_ENTRY )
    1.25 @@ -2691,10 +2689,8 @@ long do_set_gdt(unsigned long *frame_lis
    1.26      if ( copy_from_user(frames, frame_list, nr_pages * sizeof(unsigned long)) )
    1.27          return -EFAULT;
    1.28  
    1.29 -    if (shadow_mode_translate(current->domain)) {
    1.30 -        for (x = 0; x < nr_pages; x++)
    1.31 -            frames[x] = __gpfn_to_mfn(current->domain, frames[x]);
    1.32 -    }
    1.33 +    for ( i = 0; i < nr_pages; i++ )
    1.34 +        frames[i] = __gpfn_to_mfn(current->domain, frames[i]);
    1.35  
    1.36      LOCK_BIGLOCK(current->domain);
    1.37  
     2.1 --- a/xen/arch/x86/x86_32/entry.S	Wed Jan 25 23:31:07 2006 +0100
     2.2 +++ b/xen/arch/x86/x86_32/entry.S	Wed Jan 25 23:35:22 2006 +0100
     2.3 @@ -478,13 +478,13 @@ nvm86_3:/* Rewrite our stack frame and r
     2.4  .previous
     2.5  
     2.6  domain_crash_synchronous_string:
     2.7 -	.asciz "domain_crash_sync from entry.S %lx\n"
     2.8 -	
     2.9 +        .asciz "domain_crash_sync called from entry.S (%lx)\n"
    2.10 +
    2.11  domain_crash_synchronous:
    2.12 -	pushl $domain_crash_synchronous_string
    2.13 -	call printf
    2.14 -	jmp __domain_crash_synchronous
    2.15 -	
    2.16 +        pushl $domain_crash_synchronous_string
    2.17 +        call  printf
    2.18 +        jmp   __domain_crash_synchronous
    2.19 +
    2.20          ALIGN
    2.21  process_guest_exception_and_events:
    2.22          leal VCPU_trap_bounce(%ebx),%edx
     3.1 --- a/xen/arch/x86/x86_64/entry.S	Wed Jan 25 23:31:07 2006 +0100
     3.2 +++ b/xen/arch/x86/x86_64/entry.S	Wed Jan 25 23:35:22 2006 +0100
     3.3 @@ -436,6 +436,14 @@ FLT13:  movq  %rax,(%rsi)               
     3.4          .quad FLT12,domain_crash_synchronous , FLT13,domain_crash_synchronous
     3.5  .previous
     3.6  
     3.7 +domain_crash_synchronous_string:
     3.8 +        .asciz "domain_crash_sync called from entry.S\n"
     3.9 +
    3.10 +domain_crash_synchronous:
    3.11 +        leaq domain_crash_synchronous_string(%rip),%rdi
    3.12 +        call printf
    3.13 +        jmp  __domain_crash_synchronous
    3.14 +
    3.15          ALIGN
    3.16  /* %rbx: struct vcpu */
    3.17  process_guest_exception_and_events:
     4.1 --- a/xen/include/xen/sched.h	Wed Jan 25 23:31:07 2006 +0100
     4.2 +++ b/xen/include/xen/sched.h	Wed Jan 25 23:35:22 2006 +0100
     4.3 @@ -240,7 +240,7 @@ extern void domain_pause_for_debugger(vo
     4.4   */
     4.5  extern void __domain_crash(struct domain *d);
     4.6  #define domain_crash(d) do {                                              \
     4.7 -    printf("domain_crash called from %s:%d\n", __FILE__, __LINE__);       \
     4.8 +    printk("domain_crash called from %s:%d\n", __FILE__, __LINE__);       \
     4.9      __domain_crash(d);                                                    \
    4.10  } while (0)
    4.11  
    4.12 @@ -250,7 +250,7 @@ extern void __domain_crash(struct domain
    4.13   */
    4.14  extern void __domain_crash_synchronous(void) __attribute__((noreturn));
    4.15  #define domain_crash_synchronous() do {                                   \
    4.16 -    printf("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__);  \
    4.17 +    printk("domain_crash_sync called from %s:%d\n", __FILE__, __LINE__);  \
    4.18      __domain_crash_synchronous();                                         \
    4.19  } while (0)
    4.20