diff options
| author | Juan Quintela | 2020-11-18 09:37:43 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2020-12-08 19:48:58 +0100 |
| commit | 0a0a27d66bcb275e5b984d8758880a7eff75464e (patch) | |
| tree | 623492a1e9ebd06bffa8b70c8112a46b92724fa2 /hw/net | |
| parent | failover: make sure that id always exist (diff) | |
| download | qemu-0a0a27d66bcb275e5b984d8758880a7eff75464e.tar.gz qemu-0a0a27d66bcb275e5b984d8758880a7eff75464e.tar.xz qemu-0a0a27d66bcb275e5b984d8758880a7eff75464e.zip | |
failover: remove failover_find_primary_device() error parameter
It can never give one error.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20201118083748.1328-23-quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/virtio-net.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index c708c03cf6..b994796734 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -832,7 +832,7 @@ static int is_my_primary(void *opaque, QemuOpts *opts, Error **errp) * @n: VirtIONet device * @errp: returns an error if this function fails */ -static DeviceState *failover_find_primary_device(VirtIONet *n, Error **errp) +static DeviceState *failover_find_primary_device(VirtIONet *n) { Error *err = NULL; @@ -897,10 +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 = failover_find_primary_device(n, &err); - if (err) { - goto out_err; - } + n->primary_dev = failover_find_primary_device(n); failover_add_primary(n, &err); if (err) { goto out_err; @@ -3121,7 +3118,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 = failover_find_primary_device(n, &err); + n->primary_dev = failover_find_primary_device(n); if (!n->primary_dev) { return; } |