Skip to content

Commit

Permalink
failover: virtio_net_connect_failover_devices() does nothing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Juan Quintela authored and mstsirkin committed Dec 8, 2020
1 parent b91ad98 commit 0763db4
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions hw/net/virtio-net.c
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 0763db4

Please sign in to comment.