[Qemu-devel] [PATCH 3/3] virtio: rename __virtio_set_features

[Cornelia Huck]

We want to avoid reserved leading underscores, so let's call the
function virtio_set_features_nocheck() instead.

updates "virtio: disallow late feature changes for virtio-1"

Signed-off-by: Cornelia Huck <address@hidden>
---
 hw/virtio/virtio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 567c65c..7bd7339 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -1082,7 +1082,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f)
     vmstate_save_state(f, &vmstate_virtio, vdev, NULL);
 }
 
-static int __virtio_set_features(VirtIODevice *vdev, uint64_t val)
+static int virtio_set_features_nocheck(VirtIODevice *vdev, uint64_t val)
 {
     BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
     VirtioBusClass *vbusk = VIRTIO_BUS_GET_CLASS(qbus);
@@ -1107,7 +1107,7 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)
     if (vdev->status & VIRTIO_CONFIG_S_FEATURES_OK) {
         return -EINVAL;
     }
-    return __virtio_set_features(vdev, val);
+    return virtio_set_features_nocheck(vdev, val);
 }
 
 bool virtio_version_1_capable(VirtIODevice *vdev, uint64_t host_features)
@@ -1159,7 +1159,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int 
version_id)
     //}
     features = (((uint64_t)features_hi) << 32) | features_lo;
 
-    if (__virtio_set_features(vdev, features) < 0) {
+    if (virtio_set_features_nocheck(vdev, features) < 0) {
         supported_features = k->get_features(qbus->parent);
         error_report("Features 0x%"PRIx64" unsupported. Allowed features: 
0x%"PRIx64,
                      features, supported_features);
-- 
2.4.0