From mboxrd@z Thu Jan 1 00:00:00 1970 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 CEFFAC433ED for ; Wed, 7 Apr 2021 13:53:19 +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 5F2EA6113C for ; Wed, 7 Apr 2021 13:53:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F2EA6113C 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]:59858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU8cQ-000682-G9 for qemu-devel@archiver.kernel.org; Wed, 07 Apr 2021 09:53:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU8a0-00042U-7N for qemu-devel@nongnu.org; Wed, 07 Apr 2021 09:50:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU8Zy-0005xM-3N for qemu-devel@nongnu.org; Wed, 07 Apr 2021 09:50:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617803445; 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=2c9PWoZBwanCg4kf5DFuJ5LneYnpo2h+kLaMIS52jQ8=; b=aMBdnk9bzbvXMP0iFsZ8JbEmz6YCwC5l5Xx8ma3cnl7CKLKCtKkJWRrzOuBREf0kc66G/k 2apAkf5FhNrlUpr9MHMl9mchw3F4otdjHNpHGl760NXm61k2vXLmheVjjIrPEGXyoxlqi+ czPoBmEzVrYu0GCkdm8oNwFjPae5190= 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-399-3XCI6sjGN86o7kKuIR4OJA-1; Wed, 07 Apr 2021 09:50:43 -0400 X-MC-Unique: 3XCI6sjGN86o7kKuIR4OJA-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 B8EEC6D255; Wed, 7 Apr 2021 13:50:42 +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 72B5959443; Wed, 7 Apr 2021 13:50:40 +0000 (UTC) From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [RFC PATCH v2 04/11] qemu-iotests: delay QMP socket timers Date: Wed, 7 Apr 2021 15:50:14 +0200 Message-Id: <20210407135021.48330-5-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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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=ham 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" Attaching a gdbserver implies that the qmp socket should wait indefinitely for an answer from QEMU. Signed-off-by: Emanuele Giuseppe Esposito --- python/qemu/machine.py | 4 +++- tests/qemu-iotests/iotests.py | 21 +++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 18d32ebe45..284b73385f 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -408,7 +408,9 @@ def _launch(self) -> None: stderr=subprocess.STDOUT, shell=False, close_fds=False) - self._post_launch() + + timer = None if 'gdbserver' in self._wrapper 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 05d0dc0751..17f07710db 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -686,7 +686,10 @@ def qmp_to_opts(self, obj): def get_qmp_events_filtered(self, wait=60.0): result = [] - for ev in self.get_qmp_events(wait=wait): + qmp_wait = wait + if qemu_gdb: + qmp_wait = 0.0 + for ev in self.get_qmp_events(wait=qmp_wait): result.append(filter_qmp_event(ev)) return result @@ -987,13 +990,17 @@ def cancel_and_wait(self, drive='drive0', force=False, result = self.vm.qmp('block-job-cancel', device=drive, force=force) self.assert_qmp(result, 'return', {}) + qmp_wait = wait + if qemu_gdb: + qmp_wait = 0.0 + if resume: self.vm.resume_drive(drive) cancelled = False result = None while not cancelled: - for event in self.vm.get_qmp_events(wait=wait): + for event in self.vm.get_qmp_events(wait=qmp_wait): if event['event'] == 'BLOCK_JOB_COMPLETED' or \ event['event'] == 'BLOCK_JOB_CANCELLED': self.assert_qmp(event, 'data/device', drive) @@ -1009,8 +1016,11 @@ def cancel_and_wait(self, drive='drive0', force=False, 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: + qmp_wait = 0.0 while True: - for event in self.vm.get_qmp_events(wait=wait): + for event in self.vm.get_qmp_events(wait=qmp_wait): if event['event'] == 'BLOCK_JOB_COMPLETED': self.assert_qmp(event, 'data/device', drive) if error is None: @@ -1054,7 +1064,10 @@ def complete_and_wait(self, drive='drive0', wait_ready=True, self.assertTrue(event['data']['type'] in ['mirror', 'commit']) def pause_wait(self, job_id='job0'): - with Timeout(3, "Timeout waiting for job to pause"): + def_timeout = 3 + if qemu_gdb: + def_timeout = 3000 + with Timeout(def_timeout, "Timeout waiting for job to pause"): while True: result = self.vm.qmp('query-block-jobs') found = False -- 2.30.2