On 12/21/21 13:30, Thomas Huth wrote: > On 20/12/2021 15.53, Laurent Vivier wrote: >> 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 <th...@redhat.com> >> Signed-off-by: Laurent Vivier <lviv...@redhat.com> >> --- >> hw/net/virtio-net.c | 3 ++- >> migration/migration.c | 4 +++- >> 2 files changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c >> index f2014d5ea0b3..c64a6b9d1745 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 >> @@ -925,7 +926,7 @@ static void virtio_net_set_features(VirtIODevice >> *vdev, uint64_t features) >> qapi_event_send_failover_negotiated(n->netclient_name); >> qatomic_set(&n->failover_primary_hidden, false); >> failover_add_primary(n, &err); >> - if (err) { >> + if (err && !qtest_enabled()) { >> warn_report_err(err); >> } > > This trips the sanitizer build now: > > https://gitlab.com/thuth/qemu/-/jobs/1907374419 > > I think you have to error_free(err) in case qtest_enabled() ?
Indeed. In that case it might be better to add a warn_report_err_except_qtest() helper...