diff options
| author | Juan Quintela <quintela@redhat.com> | 2020-11-18 09:37:38 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-12-08 13:48:57 -0500 |
| commit | 0763db4f2df3a92336d78e8b68a665f7d1a1bc66 (patch) | |
| tree | df38490a25649dbec925b472866607a26eba0b9a | |
| parent | b91ad981b867e15171234efc3f2ab4074d377cef (diff) | |
failover: virtio_net_connect_failover_devices() does nothing
It just calls virtio_net_find_primary(), so just update the callers.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20201118083748.1328-18-quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/net/virtio-net.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 747614ff2a..c6200b924e 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -836,19 +836,6 @@ static DeviceState *virtio_net_find_primary(VirtIONet *n, Error **errp) return qdev_find_recursive(sysbus_get_default(), n->primary_device_id); } -static DeviceState *virtio_connect_failover_devices(VirtIONet *n, Error **errp) -{ - DeviceState *prim_dev = NULL; - Error *err = NULL; - - prim_dev = virtio_net_find_primary(n, &err); - if (!prim_dev) { - error_propagate(errp, err); - } - - return prim_dev; -} - static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features) { VirtIONet *n = VIRTIO_NET(vdev); @@ -904,7 +891,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_connect_failover_devices(n, &err); + n->primary_dev = virtio_net_find_primary(n, &err); if (err) { goto out_err; } @@ -3128,7 +3115,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_connect_failover_devices(n, &err); + n->primary_dev = virtio_net_find_primary(n, &err); if (!n->primary_dev) { return; } |