[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 33/65] failover: Rename to failover_find_primary_device()
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 33/65] failover: Rename to failover_find_primary_device() |
Date: |
Wed, 9 Dec 2020 13:09:12 -0500 |
From: Juan Quintela <quintela@redhat.com>
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 <quintela@redhat.com>
Message-Id: <20201118083748.1328-19-quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
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;
}
--
MST
- [PULL v2 23/65] failover: Rename bool to failover_primary_hidden, (continued)
- [PULL v2 23/65] failover: Rename bool to failover_primary_hidden, Michael S. Tsirkin, 2020/12/09
- [PULL v2 24/65] failover: g_strcmp0() knows how to handle NULL, Michael S. Tsirkin, 2020/12/09
- [PULL v2 25/65] failover: Remove primary_device_opts, Michael S. Tsirkin, 2020/12/09
- [PULL v2 26/65] failover: remove standby_id variable, Michael S. Tsirkin, 2020/12/09
- [PULL v2 27/65] failover: Remove primary_device_dict, Michael S. Tsirkin, 2020/12/09
- [PULL v2 28/65] failover: Remove memory leak, Michael S. Tsirkin, 2020/12/09
- [PULL v2 29/65] failover: simplify virtio_net_find_primary(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 30/65] failover: should_be_hidden() should take a bool, Michael S. Tsirkin, 2020/12/09
- [PULL v2 31/65] failover: Rename function to hide_device(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 32/65] failover: virtio_net_connect_failover_devices() does nothing, Michael S. Tsirkin, 2020/12/09
- [PULL v2 33/65] failover: Rename to failover_find_primary_device(),
Michael S. Tsirkin <=
- [PULL v2 34/65] failover: simplify qdev_device_add() failover case, Michael S. Tsirkin, 2020/12/09
- [PULL v2 35/65] failover: simplify qdev_device_add(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 36/65] failover: make sure that id always exist, Michael S. Tsirkin, 2020/12/09
- [PULL v2 38/65] failover: split failover_find_primary_device_id(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 39/65] failover: We don't need to cache primary_device_id anymore, Michael S. Tsirkin, 2020/12/09
- [PULL v2 40/65] failover: Caller of this two functions already have primary_dev, Michael S. Tsirkin, 2020/12/09
- [PULL v2 42/65] failover: Remove primary_dev member, Michael S. Tsirkin, 2020/12/09
- [PULL v2 41/65] failover: simplify failover_unplug_primary, Michael S. Tsirkin, 2020/12/09
- [PULL v2 43/65] hw: add compat machines for 6.0, Michael S. Tsirkin, 2020/12/09
- [PULL v2 44/65] libvhost-user: replace qemu/bswap.h with glibc endian.h, Michael S. Tsirkin, 2020/12/09