diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-07-25 13:06:07 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-07-24 22:06:12 -0400 |
commit | c624896e488ba2bff5ae497782cfb265c8b00646 (patch) | |
tree | 714145903ff8c889e9544e8366b2ee2a62234c0c /include/linux/virtio_config.h | |
parent | dd7c7bc46211785a1aa7d70feb15830f62682b3c (diff) |
virtio: Rename set_features to finalize_features
Rather than explicitly handing the features to the lower-level, we just
hand the virtio_device and have it set the features. This make it clear
that it has the chance to manipulate the features of the device at this
point (and that all feature negotiation is already done).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'include/linux/virtio_config.h')
-rw-r--r-- | include/linux/virtio_config.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h index 5a30cfb7934b..bf8ec283b232 100644 --- a/include/linux/virtio_config.h +++ b/include/linux/virtio_config.h | |||
@@ -61,9 +61,10 @@ | |||
61 | * @get_features: get the array of feature bits for this device. | 61 | * @get_features: get the array of feature bits for this device. |
62 | * vdev: the virtio_device | 62 | * vdev: the virtio_device |
63 | * Returns the first 32 feature bits (all we currently need). | 63 | * Returns the first 32 feature bits (all we currently need). |
64 | * @set_features: confirm what device features we'll be using. | 64 | * @finalize_features: confirm what device features we'll be using. |
65 | * vdev: the virtio_device | 65 | * vdev: the virtio_device |
66 | * feature: the first 32 feature bits | 66 | * This gives the final feature bits for the device: it can change |
67 | * the dev->feature bits if it wants. | ||
67 | */ | 68 | */ |
68 | struct virtio_config_ops | 69 | struct virtio_config_ops |
69 | { | 70 | { |
@@ -79,7 +80,7 @@ struct virtio_config_ops | |||
79 | void (*callback)(struct virtqueue *)); | 80 | void (*callback)(struct virtqueue *)); |
80 | void (*del_vq)(struct virtqueue *vq); | 81 | void (*del_vq)(struct virtqueue *vq); |
81 | u32 (*get_features)(struct virtio_device *vdev); | 82 | u32 (*get_features)(struct virtio_device *vdev); |
82 | void (*set_features)(struct virtio_device *vdev, u32 features); | 83 | void (*finalize_features)(struct virtio_device *vdev); |
83 | }; | 84 | }; |
84 | 85 | ||
85 | /* If driver didn't advertise the feature, it will never appear. */ | 86 | /* If driver didn't advertise the feature, it will never appear. */ |