diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 23:20:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 23:20:23 -0400 |
| commit | 99262a3dafa3290866512ddfb32609198f8973e9 (patch) | |
| tree | 6f74764150cd9c38d9ffacbeb5054b696537e154 /include/linux | |
| parent | bf67f3a5c456a18f2e8d062f7e88506ef2cd9837 (diff) | |
| parent | c6190804f1dc5357b57825f0491eb31fc9ccf130 (diff) | |
Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
Pull virtio updates from Rusty Russell.
* tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
virtio: fix typo in comment
virtio-mmio: Devices parameter parsing
virtio_blk: Drop unused request tracking list
virtio-blk: Fix hot-unplug race in remove method
virtio: Use ida to allocate virtio index
virtio: balloon: separate out common code between remove and freeze functions
virtio: balloon: drop restore_common()
9p: disconnect channel when PCI device is removed
virtio: update documentation to v0.9.5 of spec
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/virtio_config.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h index 7323a339020..fc457f452f6 100644 --- a/include/linux/virtio_config.h +++ b/include/linux/virtio_config.h | |||
| @@ -74,15 +74,6 @@ | |||
| 74 | * @set_status: write the status byte | 74 | * @set_status: write the status byte |
| 75 | * vdev: the virtio_device | 75 | * vdev: the virtio_device |
| 76 | * status: the new status byte | 76 | * status: the new status byte |
| 77 | * @request_vqs: request the specified number of virtqueues | ||
| 78 | * vdev: the virtio_device | ||
| 79 | * max_vqs: the max number of virtqueues we want | ||
| 80 | * If supplied, must call before any virtqueues are instantiated. | ||
| 81 | * To modify the max number of virtqueues after request_vqs has been | ||
| 82 | * called, call free_vqs and then request_vqs with a new value. | ||
| 83 | * @free_vqs: cleanup resources allocated by request_vqs | ||
| 84 | * vdev: the virtio_device | ||
| 85 | * If supplied, must call after all virtqueues have been deleted. | ||
| 86 | * @reset: reset the device | 77 | * @reset: reset the device |
| 87 | * vdev: the virtio device | 78 | * vdev: the virtio device |
| 88 | * After this, status and feature negotiation must be done again | 79 | * After this, status and feature negotiation must be done again |
| @@ -156,7 +147,7 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev, | |||
| 156 | * @vdev: the virtio device | 147 | * @vdev: the virtio device |
| 157 | * @fbit: the feature bit | 148 | * @fbit: the feature bit |
| 158 | * @offset: the type to search for. | 149 | * @offset: the type to search for. |
| 159 | * @val: a pointer to the value to fill in. | 150 | * @v: a pointer to the value to fill in. |
| 160 | * | 151 | * |
| 161 | * The return value is -ENOENT if the feature doesn't exist. Otherwise | 152 | * The return value is -ENOENT if the feature doesn't exist. Otherwise |
| 162 | * the config value is copied into whatever is pointed to by v. */ | 153 | * the config value is copied into whatever is pointed to by v. */ |