ia64/xen-unstable

changeset 13918:3f63c1825b0d

linux: quieten some driver printk logging.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Wed Feb 14 16:05:28 2007 +0000 (2007-02-14)
parents d44eb9e7f97b
children 58e71ae679d5
files linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Wed Feb 14 15:54:47 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Wed Feb 14 16:05:28 2007 +0000
     1.3 @@ -344,7 +344,7 @@ static void frontend_changed(struct xenb
     1.4  	switch (frontend_state) {
     1.5  	case XenbusStateInitialising:
     1.6  		if (dev->state == XenbusStateClosed) {
     1.7 -			printk("%s: %s: prepare for reconnect\n",
     1.8 +			printk(KERN_INFO "%s: %s: prepare for reconnect\n",
     1.9  			       __FUNCTION__, dev->nodename);
    1.10  			xenbus_switch_state(dev, XenbusStateInitWait);
    1.11  		}
    1.12 @@ -488,7 +488,8 @@ static int connect_ring(struct backend_i
    1.13  		xenbus_dev_fatal(dev, err, "unknown fe protocol %s", protocol);
    1.14  		return -1;
    1.15  	}
    1.16 -	printk("blkback: ring-ref %ld, event-channel %d, protocol %d (%s)\n",
    1.17 +	printk(KERN_INFO
    1.18 +	       "blkback: ring-ref %ld, event-channel %d, protocol %d (%s)\n",
    1.19  	       ring_ref, evtchn, be->blkif->blk_protocol, protocol);
    1.20  
    1.21  	/* Map the shared frame, irq etc. */
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c	Wed Feb 14 15:54:47 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c	Wed Feb 14 16:05:28 2007 +0000
     2.3 @@ -272,7 +272,7 @@ static void tap_frontend_changed(struct 
     2.4  	switch (frontend_state) {
     2.5  	case XenbusStateInitialising:
     2.6  		if (dev->state == XenbusStateClosed) {
     2.7 -			printk("%s: %s: prepare for reconnect\n",
     2.8 +			printk(KERN_INFO "%s: %s: prepare for reconnect\n",
     2.9  			       __FUNCTION__, dev->nodename);
    2.10  			xenbus_switch_state(dev, XenbusStateInitWait);
    2.11  		}
    2.12 @@ -369,7 +369,8 @@ static int connect_ring(struct backend_i
    2.13  		xenbus_dev_fatal(dev, err, "unknown fe protocol %s", protocol);
    2.14  		return -1;
    2.15  	}
    2.16 -	printk("blktap: ring-ref %ld, event-channel %d, protocol %d (%s)\n",
    2.17 +	printk(KERN_INFO
    2.18 +	       "blktap: ring-ref %ld, event-channel %d, protocol %d (%s)\n",
    2.19  	       ring_ref, evtchn, be->blkif->blk_protocol, protocol);
    2.20  
    2.21  	/* Map the shared frame, irq etc. */
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c	Wed Feb 14 15:54:47 2007 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c	Wed Feb 14 16:05:28 2007 +0000
     3.3 @@ -217,7 +217,7 @@ static void frontend_changed(struct xenb
     3.4  	switch (frontend_state) {
     3.5  	case XenbusStateInitialising:
     3.6  		if (dev->state == XenbusStateClosed) {
     3.7 -			printk("%s: %s: prepare for reconnect\n",
     3.8 +			printk(KERN_INFO "%s: %s: prepare for reconnect\n",
     3.9  			       __FUNCTION__, dev->nodename);
    3.10  			if (be->netif) {
    3.11  				netif_disconnect(be->netif);
     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Feb 14 15:54:47 2007 +0000
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Feb 14 16:05:28 2007 +0000
     4.3 @@ -1505,7 +1505,7 @@ static void netif_release_rx_bufs(struct
     4.4  	int id, ref;
     4.5  
     4.6  	if (np->copying_receiver) {
     4.7 -		printk("%s: fix me for copying receiver.\n", __FUNCTION__);
     4.8 +		WPRINTK("%s: fix me for copying receiver.\n", __FUNCTION__);
     4.9  		return;
    4.10  	}
    4.11  
    4.12 @@ -1555,8 +1555,8 @@ static void netif_release_rx_bufs(struct
    4.13  		xfer++;
    4.14  	}
    4.15  
    4.16 -	printk("%s: %d xfer, %d noxfer, %d unused\n",
    4.17 -	       __FUNCTION__, xfer, noxfer, unused);
    4.18 +	IPRINTK("%s: %d xfer, %d noxfer, %d unused\n",
    4.19 +		__FUNCTION__, xfer, noxfer, unused);
    4.20  
    4.21  	if (xfer) {
    4.22  		/* Some pages are no longer absent... */