From e1ea7c178c1762dca02e2c85f57ccfad1063c753 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Thu, 25 Feb 2021 23:14:37 -0500 Subject: [PATCH 40/54] failover: Rename to failover_find_primary_device() RH-Author: Laurent Vivier Message-id: <20210225231447.2187738-18-lvivier@redhat.com> Patchwork-id: 101263 O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 17/27] failover: Rename to failover_find_primary_device() Bugzilla: 1819991 RH-Acked-by: Dr. David Alan Gilbert RH-Acked-by: Jens Freimann RH-Acked-by: Michael S. Tsirkin From: Juan Quintela BZ: https://bugzilla.redhat.com/1819991 BRANCH: rhel-av-8.4.0 UPSTREAM: Merged This commit: * Rename them to failover_find_primary_devices() so - it starts with failover_ - it don't connect anything, just find the primary device * Create documentation for the function Signed-off-by: Juan Quintela Message-Id: <20201118083748.1328-19-quintela@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 85d3b93196e43c4493c118aa9e3a82fe657636b5) Signed-off-by: Laurent Vivier Signed-off-by: Danilo C. L. de Paula --- hw/net/virtio-net.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index c6200b924e..ff82f1017d 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -826,7 +826,13 @@ static int is_my_primary(void *opaque, QemuOpts *opts, Error **errp) return ret; } -static DeviceState *virtio_net_find_primary(VirtIONet *n, Error **errp) +/** + * Find the primary device for this failover virtio-net + * + * @n: VirtIONet device + * @errp: returns an error if this function fails + */ +static DeviceState *failover_find_primary_device(VirtIONet *n, Error **errp) { Error *err = NULL; @@ -891,7 +897,7 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) qatomic_set(&n->failover_primary_hidden, false); failover_add_primary(n, &err); if (err) { - n->primary_dev = virtio_net_find_primary(n, &err); + n->primary_dev = failover_find_primary_device(n, &err); if (err) { goto out_err; } @@ -3115,7 +3121,7 @@ static void virtio_net_handle_migration_primary(VirtIONet *n, should_be_hidden = qatomic_read(&n->failover_primary_hidden); if (!n->primary_dev) { - n->primary_dev = virtio_net_find_primary(n, &err); + n->primary_dev = failover_find_primary_device(n, &err); if (!n->primary_dev) { return; } -- 2.27.0