[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/9] failover: Silence warning messages during qtest
From: |
Thomas Huth |
Subject: |
[PULL 1/9] failover: Silence warning messages during qtest |
Date: |
Wed, 22 Dec 2021 12:32:51 +0100 |
From: Laurent Vivier <lvivier@redhat.com>
virtio-net-failover test tries several device combinations that produces
some expected warnings.
These warning can be confusing, so we disable them during the qtest
sequence.
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20211220145314.390697-1-lvivier@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
[thuth: Fix memory leak by using error_free()]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/net/virtio-net.c | 7 ++++++-
migration/migration.c | 4 +++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index f2014d5ea0..cf8ab0f8af 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -44,6 +44,7 @@
#include "hw/pci/pci.h"
#include "net_rx_pkt.h"
#include "hw/virtio/vhost.h"
+#include "sysemu/qtest.h"
#define VIRTIO_NET_VM_VERSION 11
@@ -926,7 +927,11 @@ 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) {
- warn_report_err(err);
+ if (!qtest_enabled()) {
+ warn_report_err(err);
+ } else {
+ error_free(err);
+ }
}
}
}
diff --git a/migration/migration.c b/migration/migration.c
index 3de11ae921..0652165610 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -60,6 +60,7 @@
#include "qemu/yank.h"
#include "sysemu/cpus.h"
#include "yank_functions.h"
+#include "sysemu/qtest.h"
#define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling
*/
@@ -3766,7 +3767,8 @@ static void qemu_savevm_wait_unplug(MigrationState *s,
int old_state,
while (timeout-- && qemu_savevm_state_guest_unplug_pending()) {
qemu_sem_timedwait(&s->wait_unplug_sem, 250);
}
- if (qemu_savevm_state_guest_unplug_pending()) {
+ if (qemu_savevm_state_guest_unplug_pending() &&
+ !qtest_enabled()) {
warn_report("migration: partially unplugged device on "
"failure");
}
--
2.27.0
- [PULL 0/9] qtest fixes and improvements, Thomas Huth, 2021/12/22
- [PULL 1/9] failover: Silence warning messages during qtest,
Thomas Huth <=
- [PULL 2/9] tests/qtest/boot-serial-test: Silence the warning about deprecated sga device, Thomas Huth, 2021/12/22
- [PULL 3/9] tests/qtest: Make the filter tests independent from a specific NIC, Thomas Huth, 2021/12/22
- [PULL 5/9] tests/qtest: Add a function that checks whether a device is available, Thomas Huth, 2021/12/22
- [PULL 6/9] tests/qtest: Improve endianness-test to work with missing machines and devices, Thomas Huth, 2021/12/22
- [PULL 4/9] MAINTAINERS: Update COLO Proxy section, Thomas Huth, 2021/12/22
- [PULL 9/9] tests/qtest/virtio-net-failover: Use g_file_open_tmp() to create temporary file, Thomas Huth, 2021/12/22
- [PULL 8/9] tests/qtest/boot-order-test: Check whether machines are available, Thomas Huth, 2021/12/22
- [PULL 7/9] tests/qtest/cdrom-test: Check whether devices are available before using them, Thomas Huth, 2021/12/22
- Re: [PULL 0/9] qtest fixes and improvements, Richard Henderson, 2021/12/22