From patchwork Wed Apr 7 13:50:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emanuele Giuseppe Esposito X-Patchwork-Id: 12188479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E1DDC433B4 for ; Wed, 7 Apr 2021 14:02:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 316AC611CC for ; Wed, 7 Apr 2021 14:02:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 316AC611CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU8l9-00006B-1H for qemu-devel@archiver.kernel.org; Wed, 07 Apr 2021 10:02:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU8aR-0004Jx-Cv for qemu-devel@nongnu.org; Wed, 07 Apr 2021 09:51:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU8aC-00063Z-FI for qemu-devel@nongnu.org; Wed, 07 Apr 2021 09:51:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617803457; 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=HahSciXYiof22qQ/TBDonNH7Bk4OfSRFAavMNfm1WSE=; b=hpzZCS40OFEfz9T8SpJb+4BExsyiXIGjVUfxRvYrlEcIM6yRZ9S8oguU4jkpbH4O7yP1xR t7VAXmyOjrETguH3XP6aWPE+TAUBkHUUz0mH4OQTNhAYSjnbAEah1ROG7cLvpbAvmF3Fho fl1iUVTuV7aEiUtV1A0QTHnl92Lo0vI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-181-grAiltDrPTS4EzdpqS79eQ-1; Wed, 07 Apr 2021 09:50:54 -0400 X-MC-Unique: grAiltDrPTS4EzdpqS79eQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D15051883520; Wed, 7 Apr 2021 13:50:53 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-163.ams2.redhat.com [10.36.115.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87DE059443; Wed, 7 Apr 2021 13:50:51 +0000 (UTC) From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [RFC PATCH v2 08/11] qemu_iotests: extent QMP socket timeout when using valgrind Date: Wed, 7 Apr 2021 15:50:18 +0200 Message-Id: <20210407135021.48330-9-eesposit@redhat.com> In-Reply-To: <20210407135021.48330-1-eesposit@redhat.com> References: <20210407135021.48330-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eesposit@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Emanuele Giuseppe Esposito , Eduardo Habkost , qemu-devel@nongnu.org, Max Reitz , Cleber Rosa , Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As with gdbserver, valgrind delays the test execution, so the default QMP socket timeout expires too soon. Signed-off-by: Emanuele Giuseppe Esposito --- python/qemu/machine.py | 4 +++- tests/qemu-iotests/iotests.py | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 284b73385f..4b6eb39856 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -409,7 +409,9 @@ def _launch(self) -> None: shell=False, close_fds=False) - timer = None if 'gdbserver' in self._wrapper else 15.0 + delay_timer = 'gdbserver' in self._wrapper + delay_timer |= 'valgrind' in self._wrapper + timer = None if delay_timer else 15.0 self._post_launch(timer) def _early_cleanup(self) -> None: diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 7c28f0cb74..56733954b2 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -699,7 +699,7 @@ def qmp_to_opts(self, obj): def get_qmp_events_filtered(self, wait=60.0): result = [] qmp_wait = wait - if qemu_gdb: + if qemu_gdb or qemu_valgrind: qmp_wait = 0.0 for ev in self.get_qmp_events(wait=qmp_wait): result.append(filter_qmp_event(ev)) @@ -1003,7 +1003,7 @@ def cancel_and_wait(self, drive='drive0', force=False, self.assert_qmp(result, 'return', {}) qmp_wait = wait - if qemu_gdb: + if qemu_gdb or qemu_valgrind: qmp_wait = 0.0 if resume: @@ -1029,7 +1029,7 @@ def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0, error=None): '''Wait for a block job to finish, returning the event''' qmp_wait = wait - if qemu_gdb: + if qemu_gdb or qemu_valgrind: qmp_wait = 0.0 while True: for event in self.vm.get_qmp_events(wait=qmp_wait): @@ -1077,7 +1077,7 @@ def complete_and_wait(self, drive='drive0', wait_ready=True, def pause_wait(self, job_id='job0'): def_timeout = 3 - if qemu_gdb: + if qemu_gdb or qemu_valgrind: def_timeout = 3000 with Timeout(def_timeout, "Timeout waiting for job to pause"): while True: