From nobody Mon Feb 9 13:38:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1685539482; cv=none; d=zohomail.com; s=zohoarc; b=G+jySvw7A91yHbKpcY7j0QbcKp/VSBn/SRG4rq++SN3YhbmXWlkkC7DgkpFo0h5AeIe4jvZRJKvpzDC5Ctx8K74XaV/WDo8pmya8JZBe5pAxnw4QSQH8bz+NVD/vABJlW/zaAMH5QVKhaDhHU5cHf/iLDBleXriAJ+UYp5HCsKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685539482; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6ydg4E0c9t8H5C7pZpw5lHwZfzpFaqPlxrLcxUisYKo=; b=Lz0BoiO2E8PEBA7aF6jwOXFogyuoaRZ1OTSTLtZxHntkUmR44EcWRd4Wj8R0GGjHXocG35VixH+sv2eq1V4ZQn21QTs3NvxpD1xv6U/xqhlLhCsDA+9jE6NLW6bRKwSMnZduFzbKBQKSxr2hgBnf5J6WyjX9+/Upm3A2BmjxtDk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1685539482980991.2776260913804; Wed, 31 May 2023 06:24:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4LoM-000604-73; Wed, 31 May 2023 09:24:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4LoG-0005od-RO for qemu-devel@nongnu.org; Wed, 31 May 2023 09:24:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4LoF-0004Mz-81 for qemu-devel@nongnu.org; Wed, 31 May 2023 09:24:16 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-114-M6QcwKjwMSeGw5867uRfqA-1; Wed, 31 May 2023 09:24:13 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D5BC1811E7F for ; Wed, 31 May 2023 13:24:12 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.28.177]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8212B420AA; Wed, 31 May 2023 13:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685539454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6ydg4E0c9t8H5C7pZpw5lHwZfzpFaqPlxrLcxUisYKo=; b=O2WG6yLBFe/FIVm35k59YypeFN7SKhmBbyo98eG3COg9JIDPfUKaPbNx4eaNxK1M29MjFy 2/SwI4gI6cbwtH85f7fP7bG1yN/XnkwQe/Slh3u44BrjF6wJ017QjQ2JUSymrz42ef9Bct g6WXVIYYL+ZfAqlqe8gW6CD0Kwfi+zs= X-MC-Unique: M6QcwKjwMSeGw5867uRfqA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Peter Xu , Juan Quintela , Leonardo Bras , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v3 5/9] tests/qtest: switch to using event callbacks for STOP event Date: Wed, 31 May 2023 14:23:56 +0100 Message-Id: <20230531132400.1129576-6-berrange@redhat.com> In-Reply-To: <20230531132400.1129576-1-berrange@redhat.com> References: <20230531132400.1129576-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.163, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1685539485112100007 Change the migration test to use the new qtest event callback to watch for the stop event. This ensures that we only watch for the STOP event on the source QEMU. The previous code would set the single 'got_stop' flag when either source or dest QEMU got the STOP event. Signed-off-by: Daniel P. Berrang=C3=A9 Acked-by: Thomas Huth Reviewed-by: Juan Quintela --- tests/qtest/migration-helpers.c | 18 ++++++++---------- tests/qtest/migration-helpers.h | 3 ++- tests/qtest/migration-test.c | 4 ++++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helper= s.c index e26fdcb132..936a27a944 100644 --- a/tests/qtest/migration-helpers.c +++ b/tests/qtest/migration-helpers.c @@ -23,15 +23,16 @@ */ #define MIGRATION_STATUS_WAIT_TIMEOUT 120 =20 -bool got_stop; - -static void check_stop_event(QTestState *who) +bool migrate_watch_for_stop(QTestState *who, const char *name, + QDict *event, void *opaque) { - QDict *event =3D qtest_qmp_event_ref(who, "STOP"); - if (event) { - got_stop =3D true; - qobject_unref(event); + bool *seen =3D opaque; + + if (g_str_equal(name, "STOP")) { + *seen =3D true; } + + return false; } =20 #ifndef _WIN32 @@ -48,7 +49,6 @@ QDict *wait_command_fd(QTestState *who, int fd, const cha= r *command, ...) va_end(ap); =20 resp =3D qtest_qmp_receive(who); - check_stop_event(who); =20 g_assert(!qdict_haskey(resp, "error")); g_assert(qdict_haskey(resp, "return")); @@ -73,8 +73,6 @@ QDict *wait_command(QTestState *who, const char *command,= ...) resp =3D qtest_vqmp(who, command, ap); va_end(ap); =20 - check_stop_event(who); - g_assert(!qdict_haskey(resp, "error")); g_assert(qdict_haskey(resp, "return")); =20 diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helper= s.h index 2e51a6e195..fa69d1780a 100644 --- a/tests/qtest/migration-helpers.h +++ b/tests/qtest/migration-helpers.h @@ -15,7 +15,8 @@ =20 #include "libqtest.h" =20 -extern bool got_stop; +bool migrate_watch_for_stop(QTestState *who, const char *name, + QDict *event, void *opaque); =20 #ifndef _WIN32 G_GNUC_PRINTF(3, 4) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 822516286d..0af72c37c2 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -43,6 +43,7 @@ unsigned start_address; unsigned end_address; static bool uffd_feature_thread_id; +static bool got_stop; =20 /* * Dirtylimit stop working if dirty page rate error @@ -703,6 +704,9 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, ignore_stderr); if (!args->only_target) { *from =3D qtest_init(cmd_source); + qtest_qmp_set_event_callback(*from, + migrate_watch_for_stop, + &got_stop); } =20 cmd_target =3D g_strdup_printf("-accel kvm%s -accel tcg%s%s " --=20 2.40.1