87 lines
3.1 KiB
Diff
87 lines
3.1 KiB
Diff
From cf70ee739171e208243b5b06a57d2517df8c3d91 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Thu, 25 Feb 2021 23:14:45 -0500
|
|
Subject: [PATCH 48/54] failover: simplify failover_unplug_primary
|
|
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
Message-id: <20210225231447.2187738-26-lvivier@redhat.com>
|
|
Patchwork-id: 101242
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 25/27] failover: simplify failover_unplug_primary
|
|
Bugzilla: 1819991
|
|
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
RH-Acked-by: Jens Freimann <jfreimann@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
|
|
|
|
We can calculate device just once.
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Message-Id: <20201118083748.1328-27-quintela@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 07a5d816d50f5f876d5fcd43724a6ff17cf59a4f)
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/net/virtio-net.c | 25 ++++++++++---------------
|
|
1 file changed, 10 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
index b37e9cd1d9..9203d81780 100644
|
|
--- a/hw/net/virtio-net.c
|
|
+++ b/hw/net/virtio-net.c
|
|
@@ -3146,34 +3146,29 @@ out:
|
|
return !err;
|
|
}
|
|
|
|
-static void virtio_net_handle_migration_primary(VirtIONet *n,
|
|
- MigrationState *s)
|
|
+static void virtio_net_handle_migration_primary(VirtIONet *n, MigrationState *s)
|
|
{
|
|
bool should_be_hidden;
|
|
Error *err = NULL;
|
|
+ DeviceState *dev = failover_find_primary_device(n);
|
|
|
|
- should_be_hidden = qatomic_read(&n->failover_primary_hidden);
|
|
-
|
|
- if (!n->primary_dev) {
|
|
- n->primary_dev = failover_find_primary_device(n);
|
|
- if (!n->primary_dev) {
|
|
- return;
|
|
- }
|
|
+ if (!dev) {
|
|
+ return;
|
|
}
|
|
|
|
+ should_be_hidden = qatomic_read(&n->failover_primary_hidden);
|
|
+
|
|
if (migration_in_setup(s) && !should_be_hidden) {
|
|
- if (failover_unplug_primary(n, n->primary_dev)) {
|
|
- vmstate_unregister(VMSTATE_IF(n->primary_dev),
|
|
- qdev_get_vmsd(n->primary_dev),
|
|
- n->primary_dev);
|
|
- qapi_event_send_unplug_primary(n->primary_dev->id);
|
|
+ if (failover_unplug_primary(n, dev)) {
|
|
+ vmstate_unregister(VMSTATE_IF(dev), qdev_get_vmsd(dev), dev);
|
|
+ qapi_event_send_unplug_primary(dev->id);
|
|
qatomic_set(&n->failover_primary_hidden, true);
|
|
} else {
|
|
warn_report("couldn't unplug primary device");
|
|
}
|
|
} else if (migration_has_failed(s)) {
|
|
/* We already unplugged the device let's plug it back */
|
|
- if (!failover_replug_primary(n, n->primary_dev, &err)) {
|
|
+ if (!failover_replug_primary(n, dev, &err)) {
|
|
if (err) {
|
|
error_report_err(err);
|
|
}
|
|
--
|
|
2.27.0
|
|
|