From nobody Tue Feb 10 04:15:19 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=1685703067; cv=none; d=zohomail.com; s=zohoarc; b=UvIPet/Onpgmf0eiLvdbfGmy2EeFfUZBEVotawOlYCYHZMnT3LfyJOeAZdj3f0VOzGCC2sKpC6gs1jN80micGOU3xBNf7ZRM7rLGIAfBxt6Bu01dAg+iC5h5P/1Cp/eFs2oGlceRTygcC0+A9eXfOkkH6wSnbexgHmgpoxDcEi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685703067; 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=w+nE9rNIJBj109SfbBmE2f54T6hGgPff3hRdd/+2AB4=; b=g0hn/vIzf2D4TcuAC0ImMBvv+O4ZYd9YuYr7tfOmW1oYbpwB03GTw7T6Jgv3TEa+6t7yiFs6sGuh5zdgIDRT46yg27Uw/dTBgUXEYluRDbuZbL04KfsghLpPFjS7RsOpnUsAKw5EkEz5GegqBtpNRhpuCljv8PvXNPzG55HTlQg= 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 1685703067500216.50435997315765; Fri, 2 Jun 2023 03:51:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q52Ll-0007C9-AE; Fri, 02 Jun 2023 06:49:41 -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 1q52Ld-0007AS-0q for qemu-devel@nongnu.org; Fri, 02 Jun 2023 06:49:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q52La-0002Kx-9H for qemu-devel@nongnu.org; Fri, 02 Jun 2023 06:49:32 -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-297-_fl7x3lvNR65-vDKC1kzcg-1; Fri, 02 Jun 2023 06:49:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A574B800BFF for ; Fri, 2 Jun 2023 10:49:20 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A3BE40CFD00; Fri, 2 Jun 2023 10:49:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685702969; 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=w+nE9rNIJBj109SfbBmE2f54T6hGgPff3hRdd/+2AB4=; b=ix8O96OFPH96e2iQMiyfQtZFPvx9HZG4T81ZLW4saPS9XA2TFI41dJNpP+3uLu1uSpUAJM DdboCspX6V9FXTF1nw4PttbiwSPj+HOU8hmUYzdSg8f2wcopA+IXTe4dFd/JKor44t7Mjh UbR6DFEDfpq0D5bNBVfBSctnoZRA2Xo= X-MC-Unique: _fl7x3lvNR65-vDKC1kzcg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Thomas Huth , Leonardo Bras , Laurent Vivier , Peter Xu , Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 05/10] tests/qtest: switch to using event callbacks for STOP event Date: Fri, 2 Jun 2023 12:49:05 +0200 Message-Id: <20230602104910.35157-6-quintela@redhat.com> In-Reply-To: <20230602104910.35157-1-quintela@redhat.com> References: <20230602104910.35157-1-quintela@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.1 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.129.124; envelope-from=quintela@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.166, 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: 1685703069043100007 From: Daniel P. Berrang=C3=A9 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. Reviewed-by: Juan Quintela Acked-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20230601161347.1803440-6-berrange@redhat.com> Signed-off-by: Juan Quintela --- tests/qtest/migration-helpers.h | 3 ++- tests/qtest/migration-helpers.c | 19 +++++++++---------- tests/qtest/migration-test.c | 4 ++++ 3 files changed, 15 insertions(+), 11 deletions(-) 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-helpers.c b/tests/qtest/migration-helper= s.c index e26fdcb132..7ceadecf84 100644 --- a/tests/qtest/migration-helpers.c +++ b/tests/qtest/migration-helpers.c @@ -23,15 +23,17 @@ */ #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 true; } + + return false; } =20 #ifndef _WIN32 @@ -48,7 +50,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 +74,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-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