ia64/xen-unstable

changeset 7131:65882bf339f6

Slight rejig avoids grant entry warning message on xm save.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Sep 29 16:39:32 2005 +0100 (2005-09-29)
parents f633c3d0315b
children b9e5573785bb
files linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Sep 29 11:25:50 2005 -0400
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Sep 29 16:39:32 2005 +0100
     1.3 @@ -683,8 +683,6 @@ static int blkfront_suspend(struct xenbu
     1.4  	kfree(info->backend);
     1.5  	info->backend = NULL;
     1.6  
     1.7 -	blkif_free(info);
     1.8 -
     1.9  	return 0;
    1.10  }
    1.11  
    1.12 @@ -693,11 +691,12 @@ static int blkfront_resume(struct xenbus
    1.13  	struct blkfront_info *info = dev->data;
    1.14  	int err;
    1.15  
    1.16 -	/* FIXME: Check geometry hasn't changed here... */
    1.17 +	blkif_free(info);
    1.18 +
    1.19  	err = talk_to_backend(dev, info);
    1.20 -	if (!err) {
    1.21 +	if (!err)
    1.22  		blkif_recover(info);
    1.23 -	}
    1.24 +
    1.25  	return err;
    1.26  }
    1.27  
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Sep 29 11:25:50 2005 -0400
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Sep 29 16:39:32 2005 +0100
     2.3 @@ -1247,24 +1247,17 @@ static int netfront_remove(struct xenbus
     2.4  static int netfront_suspend(struct xenbus_device *dev)
     2.5  {
     2.6  	struct netfront_info *info = dev->data;
     2.7 -
     2.8  	unregister_xenbus_watch(&info->watch);
     2.9  	kfree(info->backend);
    2.10  	info->backend = NULL;
    2.11 -
    2.12 -	netif_free(info);
    2.13 -
    2.14  	return 0;
    2.15  }
    2.16  
    2.17  static int netfront_resume(struct xenbus_device *dev)
    2.18  {
    2.19 -	struct net_private *np = dev->data;
    2.20 -	int err;
    2.21 -
    2.22 -	err = talk_to_backend(dev, np);
    2.23 -
    2.24 -	return err;
    2.25 +	struct netfront_info *info = dev->data;
    2.26 +	netif_free(info);
    2.27 +	return talk_to_backend(dev, info);
    2.28  }
    2.29  
    2.30  static struct xenbus_driver netfront = {