1.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Nov 25 20:13:38 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Nov 25 21:06:45 2004 +0000
     1.3 @@ -73,12 +73,6 @@ static char * blkif_status_name[] = {
     1.4      [BLKIF_INTERFACE_STATUS_CHANGED]      = "changed",
     1.5  };
     1.6  
     1.7 -#if 1
     1.8 -#define dprintf(fmt, args...) \
     1.9 -printk(KERN_ALERT "[XEN:%s:%s:%d] " fmt, \
    1.10 -__FUNCTION__, __FILE__, __LINE__, ##args)
    1.11 -#endif
    1.12 -
    1.13  #define WPRINTK(fmt, args...) printk(KERN_WARNING "xen_blk: " fmt, ##args)
    1.14  
    1.15  static int blkif_handle = 0;
    1.16 @@ -189,10 +183,8 @@ static inline void flush_requests(void)
    1.17  __initcall(xlblk_init);
    1.18  
    1.19  #if ENABLE_VBD_UPDATE
    1.20 -static void vbd_update()
    1.21 +static void vbd_update(void)
    1.22  {
    1.23 -    dprintf(">\n");
    1.24 -    dprintf("<\n");
    1.25  }
    1.26  #endif /* ENABLE_VBD_UPDATE */
    1.27  
    1.28 @@ -412,7 +404,7 @@ void do_blkif_request(request_queue_t *r
    1.29              blk_stop_queue(rq);
    1.30              break;
    1.31          }
    1.32 -        DPRINTK("do_blkif_request %p: cmd %p, sec %lx, (%u/%li) buffer:%p [%s]\n",
    1.33 +        DPRINTK("do_blk_req %p: cmd %p, sec %lx, (%u/%li) buffer:%p [%s]\n",
    1.34                  req, req->cmd, req->sector, req->current_nr_sectors,
    1.35                  req->nr_sectors, req->buffer,
    1.36                  rq_data_dir(req) ? "write" : "read");
    1.37 @@ -528,10 +520,8 @@ static void update_vbds_task(void *unuse
    1.38  static void vbd_update(void)
    1.39  {
    1.40      static struct tq_struct update_tq;
    1.41 -    dprintf(">\n");
    1.42      update_tq.routine = update_vbds_task;
    1.43      schedule_task(&update_tq);
    1.44 -    dprintf("<\n");
    1.45  }
    1.46  
    1.47  #endif /* ENABLE_VBD_UPDATE */
    1.48 @@ -775,8 +765,6 @@ int blkif_revalidate(kdev_t dev)
    1.49  }
    1.50  
    1.51  
    1.52 -
    1.53 -
    1.54  /*
    1.55   * blkif_queue_request
    1.56   *
    1.57 @@ -896,8 +884,6 @@ static int blkif_queue_request(unsigned 
    1.58      /* Keep a private copy so we can reissue requests when recovering. */    
    1.59      translate_req_to_pfn(&rec_ring[xid], req );
    1.60  
    1.61 -
    1.62 -
    1.63      return 0;
    1.64  }
    1.65  
    1.66 @@ -1125,8 +1111,6 @@ static void blkif_send_interface_connect
    1.67  
    1.68  static void blkif_free(void)
    1.69  {
    1.70 -    printk(KERN_INFO "xen_blk: Recovering virtual block device driver\n");
    1.71 -
    1.72      /* Prevent new requests being issued until we fix things up. */
    1.73      spin_lock_irq(&blkif_io_lock);
    1.74      recovery = 1;
    1.75 @@ -1153,7 +1137,8 @@ static void blkif_close(void)
    1.76  /* Move from CLOSED to DISCONNECTED state. */
    1.77  static void blkif_disconnect(void)
    1.78  {
    1.79 -    if(blk_ring) free_page((unsigned long)blk_ring);
    1.80 +    if ( blk_ring != NULL )
    1.81 +        free_page((unsigned long)blk_ring);
    1.82      blk_ring = (blkif_ring_t *)__get_free_page(GFP_KERNEL);
    1.83      blk_ring->req_prod = blk_ring->resp_prod = resp_cons = req_prod = 0;
    1.84      blkif_state  = BLKIF_STATE_DISCONNECTED;
    1.85 @@ -1162,7 +1147,6 @@ static void blkif_disconnect(void)
    1.86  
    1.87  static void blkif_reset(void)
    1.88  {
    1.89 -    printk(KERN_INFO "xen_blk: Recovering virtual block device driver\n");
    1.90      blkif_free();
    1.91      blkif_disconnect();
    1.92  }
    1.93 @@ -1185,8 +1169,6 @@ static void blkif_recover(void)
    1.94          }
    1.95      }
    1.96  
    1.97 -    printk(KERN_ALERT"blkfront: recovered %d descriptors\n",req_prod);
    1.98 -	    
    1.99      /* Stage 2 : Set up shadow list. */
   1.100      for ( i = 0; i < req_prod; i++ ) 
   1.101      {
   1.102 @@ -1253,9 +1235,9 @@ static void blkif_connect(blkif_fe_inter
   1.103  
   1.104  static void unexpected(blkif_fe_interface_status_t *status)
   1.105  {
   1.106 -    WPRINTK(" Unexpected blkif status %s in state %s\n", 
   1.107 -           blkif_status_name[status->status],
   1.108 -           blkif_state_name[blkif_state]);
   1.109 +    DPRINTK(" Unexpected blkif status %s in state %s\n", 
   1.110 +            blkif_status_name[status->status],
   1.111 +            blkif_state_name[blkif_state]);
   1.112  }
   1.113  
   1.114  static void blkif_status(blkif_fe_interface_status_t *status)
   1.115 @@ -1291,7 +1273,7 @@ static void blkif_status(blkif_fe_interf
   1.116              break;
   1.117          case BLKIF_STATE_DISCONNECTED:
   1.118          case BLKIF_STATE_CONNECTED:
   1.119 -            unexpected(status);
   1.120 +            /* unexpected(status); */ /* occurs during suspend/resume */
   1.121              blkif_reset();
   1.122              break;
   1.123          }

     2.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c	Thu Nov 25 20:13:38 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c	Thu Nov 25 21:06:45 2004 +0000
     2.3 @@ -658,6 +658,8 @@ const struct consw xennull_con = {
     2.4  
     2.5  static int __init xencons_init(void)
     2.6  {
     2.7 +    int rc;
     2.8 +
     2.9      if ( xc_mode == XC_OFF )
    2.10          return 0;
    2.11  
    2.12 @@ -713,9 +715,12 @@ static int __init xencons_init(void)
    2.13      xencons_driver.wait_until_sent = xencons_wait_until_sent;
    2.14  #endif
    2.15  
    2.16 -    if ( tty_register_driver(DRV(xencons_driver)) )
    2.17 -        panic("Couldn't register Xen virtual console driver as %s\n",
    2.18 -              DRV(xencons_driver)->name);
    2.19 +    if ( (rc = tty_register_driver(DRV(xencons_driver))) != 0 )
    2.20 +    {
    2.21 +        printk("Couldn't register Xen virtual console driver as %s\n",
    2.22 +               DRV(xencons_driver)->name);
    2.23 +        return rc;
    2.24 +    }
    2.25  
    2.26  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
    2.27      tty_register_device(xencons_driver, 0, NULL);

     3.1 --- a/xen/arch/x86/domain.c	Thu Nov 25 20:13:38 2004 +0000
     3.2 +++ b/xen/arch/x86/domain.c	Thu Nov 25 21:06:45 2004 +0000
     3.3 @@ -524,8 +524,6 @@ static void relinquish_list(struct domai
     3.4  
     3.5  void domain_relinquish_memory(struct domain *d)
     3.6  {
     3.7 -    audit_domain(d);
     3.8 -
     3.9      /* Ensure that noone is running over the dead domain's page tables. */
    3.10      synchronise_pagetables(~0UL);
    3.11