69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
From 69ba4fc743b29e9e3f595c1e96596204abc1aa0e Mon Sep 17 00:00:00 2001
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Thu, 25 Feb 2021 23:14:24 -0500
|
|
Subject: [PATCH 27/54] failover: Remove unused parameter
|
|
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
Message-id: <20210225231447.2187738-5-lvivier@redhat.com>
|
|
Patchwork-id: 101243
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 04/27] failover: Remove unused parameter
|
|
Bugzilla: 1819991
|
|
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
|
|
BZ: https://bugzilla.redhat.com/1819991
|
|
BRANCH: rhel-av-8.4.0
|
|
UPSTREAM: Merged
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Message-Id: <20201118083748.1328-6-quintela@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 82ceb65799855efb0db965a6ef86d81ae1c8bcd7)
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/net/virtio-net.c | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
index 786d313330..3f658d6246 100644
|
|
--- a/hw/net/virtio-net.c
|
|
+++ b/hw/net/virtio-net.c
|
|
@@ -855,9 +855,7 @@ static DeviceState *virtio_net_find_primary(VirtIONet *n, Error **errp)
|
|
return dev;
|
|
}
|
|
|
|
-static DeviceState *virtio_connect_failover_devices(VirtIONet *n,
|
|
- DeviceState *dev,
|
|
- Error **errp)
|
|
+static DeviceState *virtio_connect_failover_devices(VirtIONet *n, Error **errp)
|
|
{
|
|
DeviceState *prim_dev = NULL;
|
|
Error *err = NULL;
|
|
@@ -928,7 +926,7 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features)
|
|
qatomic_set(&n->primary_should_be_hidden, false);
|
|
failover_add_primary(n, &err);
|
|
if (err) {
|
|
- n->primary_dev = virtio_connect_failover_devices(n, n->qdev, &err);
|
|
+ n->primary_dev = virtio_connect_failover_devices(n, &err);
|
|
if (err) {
|
|
goto out_err;
|
|
}
|
|
@@ -3164,7 +3162,7 @@ static void virtio_net_handle_migration_primary(VirtIONet *n,
|
|
should_be_hidden = qatomic_read(&n->primary_should_be_hidden);
|
|
|
|
if (!n->primary_dev) {
|
|
- n->primary_dev = virtio_connect_failover_devices(n, n->qdev, &err);
|
|
+ n->primary_dev = virtio_connect_failover_devices(n, &err);
|
|
if (!n->primary_dev) {
|
|
return;
|
|
}
|
|
--
|
|
2.27.0
|
|
|