1.1 --- a/xen/arch/i386/pdb-stub.c	Fri Mar 26 15:20:56 2004 +0000
     1.2 +++ b/xen/arch/i386/pdb-stub.c	Fri Mar 26 15:52:43 2004 +0000
     1.3 @@ -18,7 +18,7 @@
     1.4  #include <xen/list.h>
     1.5  #include <xen/serial.h>
     1.6  
     1.7 -#define DEBUG_TRACE
     1.8 +#undef DEBUG_TRACE
     1.9  #ifdef DEBUG_TRACE
    1.10  #define TRC(_x) _x
    1.11  #else
    1.12 @@ -352,9 +352,10 @@ pdb_process_command (char *ptr, struct p
    1.13  	else
    1.14  	  pdb_ctx[pdb_level].ctrl_cr3 = pagetable_val(p->mm.pagetable);
    1.15  	put_task_struct(p);
    1.16 -	printk ("PROCESS: PDB SET CONTROL DOMAIN TO 0x%lx 0x%x\n",
    1.17 +
    1.18 +	TRC(printk ("PROCESS: PDB SET CONTROL DOMAIN TO 0x%lx 0x%x\n",
    1.19  		pdb_ctx[pdb_level].ctrl_cr3, 
    1.20 -		pdb_ctx[pdb_level].ctrl);
    1.21 +		pdb_ctx[pdb_level].ctrl));
    1.22      }
    1.23      if (pdb_ctx[pdb_level].info_cr3 == 0 &&
    1.24  	pdb_ctx[pdb_level].info >= 0)
    1.25 @@ -367,9 +368,9 @@ pdb_process_command (char *ptr, struct p
    1.26  	else
    1.27  	  pdb_ctx[pdb_level].info_cr3 = pagetable_val(p->mm.pagetable);
    1.28  	put_task_struct(p);
    1.29 -	printk ("PROCESS: PDB SET INFO DOMAIN TO 0x%lx 0x%x\n",
    1.30 +	TRC(printk ("PROCESS: PDB SET INFO DOMAIN TO 0x%lx 0x%x\n",
    1.31  		pdb_ctx[pdb_level].info_cr3, 
    1.32 -		pdb_ctx[pdb_level].info);
    1.33 +		pdb_ctx[pdb_level].info));
    1.34      }
    1.35  
    1.36      switch (*ptr++)
    1.37 @@ -473,9 +474,9 @@ pdb_process_command (char *ptr, struct p
    1.38  		    else
    1.39  		      pdb_ctx[pdb_level].ctrl_cr3 = pagetable_val(p->mm.pagetable);
    1.40  		    put_task_struct(p);
    1.41 -		    printk ("PDB SET CONTROL DOMAIN TO 0x%lx 0x%x\n",
    1.42 +		    TRC(printk ("PDB SET CONTROL DOMAIN TO 0x%lx 0x%x\n",
    1.43  			    pdb_ctx[pdb_level].ctrl_cr3,
    1.44 -			    pdb_ctx[pdb_level].ctrl);
    1.45 +			    pdb_ctx[pdb_level].ctrl));
    1.46  		}
    1.47              }
    1.48              else if (*ptr == 'g')
    1.49 @@ -490,9 +491,9 @@ pdb_process_command (char *ptr, struct p
    1.50  		    else
    1.51  		      pdb_ctx[pdb_level].info_cr3 = pagetable_val(p->mm.pagetable);
    1.52  		    put_task_struct(p);
    1.53 -		    printk ("PDB SET INFO DOMAIN TO 0x%lx 0x%x\n",
    1.54 +		    TRC(printk ("PDB SET INFO DOMAIN TO 0x%lx 0x%x\n",
    1.55  			    pdb_ctx[pdb_level].info_cr3,
    1.56 -			    pdb_ctx[pdb_level].info);
    1.57 +			    pdb_ctx[pdb_level].info));
    1.58  		}
    1.59              }
    1.60              else
    1.61 @@ -981,12 +982,13 @@ int pdb_change_values_one_page(u_char *b
    1.62      if (!(l2_pgentry_val(*l2_table) & _PAGE_PRESENT)) 
    1.63      {
    1.64          struct task_struct *p = find_domain_by_id(0);
    1.65 -	printk ("cr3: 0x%lx    dom0cr3:  0x%lx\n",  cr3,
    1.66 +	printk ("pdb error: cr3: 0x%lx    dom0cr3:  0x%lx\n",  cr3,
    1.67  		p->mm.shadow_mode ? pagetable_val(p->mm.shadow_table)
    1.68  		                  : pagetable_val(p->mm.pagetable));
    1.69  	put_task_struct(p);
    1.70  
    1.71 -	printk ("L2:0x%p (0x%lx) \n", l2_table, l2_pgentry_val(*l2_table));
    1.72 +	printk ("pdb error: L2:0x%p (0x%lx) \n", 
    1.73 +		l2_table, l2_pgentry_val(*l2_table));
    1.74  	goto exit2;
    1.75      }
    1.76  
    1.77 @@ -1161,7 +1163,7 @@ int pdb_handle_exception(int exceptionVe
    1.78      }
    1.79  
    1.80      printk("pdb_handle_exception [0x%x][0x%lx:0x%lx]\n",
    1.81 -           exceptionVector, cr3, xen_regs->eip);
    1.82 +	   exceptionVector, cr3, xen_regs->eip);
    1.83  
    1.84      if ( pdb_stepping )
    1.85      {