korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 00:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

virtio: balloon: separate out common code between remove and freeze functions

Browse Source 
The remove and freeze functions have a lot of shared code; put it into a
common function that gets called by both.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Amit Shah 2012-04-27 00:45:57 +05:30 committed by Rusty Russell
parent c45b4166d9
commit c877bab507
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/virtio/virtio_balloon.c
View File

@ -381,21 +381,25 @@ out:
return err; return err;
} }
static void __devexit virtballoon_remove(struct virtio_device *vdev) static void remove_common(struct virtio_balloon *vb)
{ {
struct virtio_balloon *vb = vdev->priv;
kthread_stop(vb->thread);
/* There might be pages left in the balloon: free them. */ /* There might be pages left in the balloon: free them. */
while (vb->num_pages) while (vb->num_pages)
leak_balloon(vb, vb->num_pages); leak_balloon(vb, vb->num_pages);
update_balloon_size(vb); update_balloon_size(vb);
/* Now we reset the device so we can clean up the queues. */ /* Now we reset the device so we can clean up the queues. */
vdev->config->reset(vdev); vb->vdev->config->reset(vb->vdev);
vdev->config->del_vqs(vdev); vb->vdev->config->del_vqs(vb->vdev);
}
static void __devexit virtballoon_remove(struct virtio_device *vdev)
{
struct virtio_balloon *vb = vdev->priv;
kthread_stop(vb->thread);
remove_common(vb);
kfree(vb); kfree(vb);
} }
@ -409,13 +413,7 @@ static int virtballoon_freeze(struct virtio_device *vdev)
* function is called. * function is called.
*/ */
while (vb->num_pages) remove_common(vb);
leak_balloon(vb, vb->num_pages);
update_balloon_size(vb);
/* Ensure we don't get any more requests from the host */
vdev->config->reset(vdev);
vdev->config->del_vqs(vdev);
return 0; return 0;
} }