ia64/xen-unstable

changeset 3743:e2b4ca470b91

bitkeeper revision 1.1159.1.552 (420918f8LzMe7S_sxvvaHtdM_xcpYg)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk
author iap10@freefall.cl.cam.ac.uk
date Tue Feb 08 19:54:32 2005 +0000 (2005-02-08)
parents d633a3d0f36c d1e1c9854420
children 6637d3633038
files linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c xen/arch/x86/domain.c xen/arch/x86/mm.c xen/arch/x86/vmx.c xen/include/asm-x86/shadow.h
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c	Tue Feb 08 18:21:54 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c	Tue Feb 08 19:54:32 2005 +0000
     1.3 @@ -1,11 +1,11 @@
     1.4  /******************************************************************************
     1.5 - * arch/xen/drivers/netif/backend/main.c
     1.6 + * drivers/xen/netback/netback.c
     1.7   * 
     1.8 - * Back-end of the driver for virtual block devices. This portion of the
     1.9 - * driver exports a 'unified' block-device interface that can be accessed
    1.10 + * Back-end of the driver for virtual network devices. This portion of the
    1.11 + * driver exports a 'unified' network-device interface that can be accessed
    1.12   * by any operating system that implements a compatible front end. A 
    1.13   * reference front-end implementation can be found in:
    1.14 - *  arch/xen/drivers/netif/frontend
    1.15 + *  drivers/xen/netfront/netfront.c
    1.16   * 
    1.17   * Copyright (c) 2002-2004, K A Fraser
    1.18   */
     2.1 --- a/xen/arch/x86/domain.c	Tue Feb 08 18:21:54 2005 +0000
     2.2 +++ b/xen/arch/x86/domain.c	Tue Feb 08 19:54:32 2005 +0000
     2.3 @@ -783,6 +783,7 @@ void domain_relinquish_memory(struct dom
     2.4          if ( pagetable_val(ed->arch.pagetable) != 0 )
     2.5              put_page_and_type(&frame_table[pagetable_val(ed->arch.pagetable) >>
     2.6                                             PAGE_SHIFT]);
     2.7 +        ed->arch.pagetable = mk_pagetable(0);
     2.8      }
     2.9  
    2.10  #ifdef CONFIG_VMX
     3.1 --- a/xen/arch/x86/mm.c	Tue Feb 08 18:21:54 2005 +0000
     3.2 +++ b/xen/arch/x86/mm.c	Tue Feb 08 19:54:32 2005 +0000
     3.3 @@ -2318,8 +2318,9 @@ void audit_domain(struct domain *d)
     3.4  
     3.5  
     3.6      /* PHASE 1 */
     3.7 -
     3.8 -    adjust(&frame_table[pagetable_val(d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], -1, 1);
     3.9 +    if ( pagetable_val(d->exec_domain[0]->arch.pagetable) )
    3.10 +        adjust(&frame_table[pagetable_val(d->exec_domain[0]->arch.pagetable)
    3.11 +                           >>PAGE_SHIFT], -1, 1);
    3.12  
    3.13      list_ent = d->page_list.next;
    3.14      for ( i = 0; (list_ent != &d->page_list); i++ )
    3.15 @@ -2572,10 +2573,11 @@ void audit_domain(struct domain *d)
    3.16  
    3.17      spin_unlock(&d->page_alloc_lock);
    3.18  
    3.19 -    adjust(&frame_table[pagetable_val(
    3.20 -        d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], 1, 1);
    3.21 -
    3.22 -    printk("Audit %d: Done. ctot=%d ttot=%d\n", d->id, ctot, ttot );
    3.23 +    if ( pagetable_val(d->exec_domain[0]->arch.pagetable) )
    3.24 +        adjust(&frame_table[pagetable_val(
    3.25 +            d->exec_domain[0]->arch.pagetable)>>PAGE_SHIFT], 1, 1);
    3.26 +
    3.27 +    printk("Audit %d: Done. pages=%d ctot=%d ttot=%d\n", d->id, i, ctot, ttot );
    3.28  
    3.29      if ( d != current->domain )
    3.30          domain_unpause(d);
     4.1 --- a/xen/arch/x86/vmx.c	Tue Feb 08 18:21:54 2005 +0000
     4.2 +++ b/xen/arch/x86/vmx.c	Tue Feb 08 19:54:32 2005 +0000
     4.3 @@ -828,7 +828,7 @@ asmlinkage void vmx_vmexit_handler(struc
     4.4      case EXIT_REASON_EXTERNAL_INTERRUPT: 
     4.5      {
     4.6          extern int vector_irq[];
     4.7 -        extern asmlinkage void do_IRQ(struct xen_regs);
     4.8 +        extern asmlinkage void do_IRQ(struct xen_regs *);
     4.9          extern void smp_apic_timer_interrupt(struct xen_regs *);
    4.10          extern void timer_interrupt(int, void *, struct xen_regs *);
    4.11          unsigned int    vector;
    4.12 @@ -845,7 +845,7 @@ asmlinkage void vmx_vmexit_handler(struc
    4.13          } else {
    4.14              regs.entry_vector = (vector == FIRST_DEVICE_VECTOR?
    4.15                       0 : vector_irq[vector]);
    4.16 -            do_IRQ(regs);
    4.17 +            do_IRQ(&regs);
    4.18          }
    4.19          break;
    4.20      }
     5.1 --- a/xen/include/asm-x86/shadow.h	Tue Feb 08 18:21:54 2005 +0000
     5.2 +++ b/xen/include/asm-x86/shadow.h	Tue Feb 08 19:54:32 2005 +0000
     5.3 @@ -73,9 +73,9 @@ static inline void shadow_invalidate(str
     5.4      memset(ed->arch.shadow_vtable, 0, PAGE_SIZE);
     5.5  }
     5.6  
     5.7 -#define SHADOW_DEBUG 1
     5.8 +#define SHADOW_DEBUG 0
     5.9  #define SHADOW_VERBOSE_DEBUG 0
    5.10 -#define SHADOW_HASH_DEBUG 1
    5.11 +#define SHADOW_HASH_DEBUG 0
    5.12  
    5.13  struct shadow_status {
    5.14      unsigned long pfn;            /* Guest pfn.             */