ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

failover: Silence warning messages during qtest 

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>
This commit is contained in:
Laurent Vivier 2021-12-20 15:53:14 +01:00 committed by Thomas Huth
parent 8c5f94cd41
commit 1b529d908d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/net/virtio-net.c
View File

@ -44,6 +44,7 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "net_rx_pkt.h" #include "net_rx_pkt.h"
#include "hw/virtio/vhost.h" #include "hw/virtio/vhost.h"
#include "sysemu/qtest.h"
#define VIRTIO_NET_VM_VERSION 11 #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); qatomic_set(&n->failover_primary_hidden, false);
failover_add_primary(n, &err); failover_add_primary(n, &err);
if (err) { if (err) {
warn_report_err(err); if (!qtest_enabled()) {
warn_report_err(err);
} else {
error_free(err);
}
} }
} }
} }

4
migration/migration.c
View File

@ -60,6 +60,7 @@
#include "qemu/yank.h" #include "qemu/yank.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "yank_functions.h" #include "yank_functions.h"
#include "sysemu/qtest.h"
#define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */ #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()) { while (timeout-- && qemu_savevm_state_guest_unplug_pending()) {
qemu_sem_timedwait(&s->wait_unplug_sem, 250); 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 " warn_report("migration: partially unplugged device on "
"failure"); "failure");
} }