From patchwork Wed Jun 6 14:23:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 163386 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 53B64B6F13 for ; Thu, 7 Jun 2012 00:24:16 +1000 (EST) Received: from localhost ([::1]:33201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScH9h-00008L-UT for incoming@patchwork.ozlabs.org; Wed, 06 Jun 2012 10:24:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScH9L-00081U-Gt for qemu-devel@nongnu.org; Wed, 06 Jun 2012 10:24:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScH9C-0003gi-Ck for qemu-devel@nongnu.org; Wed, 06 Jun 2012 10:23:51 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:33695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScH9C-0003fI-4x for qemu-devel@nongnu.org; Wed, 06 Jun 2012 10:23:42 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so9820770pbb.4 for ; Wed, 06 Jun 2012 07:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=dujoCnbtBVA4WZQ4N5NAABPyTUWCXgN7kJz/eF/6H3A=; b=hjwR45nwohTgtM13d1C6eMX5UgrSGumehrYa/NcdgM0zsmTcF58pFuGIelLpm+4G2u rgbtKWwOLPyvdGDF0QmWHE0ZWaR4owHvYNyKLqtlKwM+jC8h53pUefV+rbJ+n8DdpS82 fdj/LDk08n88d9w6pZ0c58XI0fNZuvbcJYk9CAfq2AFk0XvY5/ZYi/4PbmdprRThb3x2 mGPLlU8Pu3GDV6r/BjF55TgbmMSTiwRrpx0Xka35yqtDgSHI7hNu4QFFlhE3QeQtddkQ GGFnaG0kJ+QuKMfQXvBUS79vXTgjauMkcQeD7cIq7ciftVLc2DiplHVhuXzO9e+1RT7x avXg== Received: by 10.68.221.132 with SMTP id qe4mr42279363pbc.128.1338992621175; Wed, 06 Jun 2012 07:23:41 -0700 (PDT) Received: from yakj.usersys.redhat.com (222-151-096-013.jp.fiberbit.net. [222.151.96.13]) by mx.google.com with ESMTPS id rv5sm537631pbc.56.2012.06.06.07.23.38 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 06 Jun 2012 07:23:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 6 Jun 2012 16:23:27 +0200 Message-Id: <1338992607-12388-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1338992607-12388-1-git-send-email-pbonzini@redhat.com> References: <1338992607-12388-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH v2 2/2] qemu-iotests: start vms in qtest mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This way, they will not execute any VM code at all. However, right now the cancellation test is "relying" on being slowed down by TCG executing BIOS code. So, change the timeouts. Signed-off-by: Paolo Bonzini --- tests/qemu-iotests/030 | 2 +- tests/qemu-iotests/iotests.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 4ab7d62..cc671dd 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -147,7 +147,7 @@ class TestStreamStop(ImageStreamingTestCase): result = self.vm.qmp('block-stream', device='drive0') self.assert_qmp(result, 'return', {}) - time.sleep(1) + time.sleep(0.1) events = self.vm.get_qmp_events(wait=False) self.assertEqual(events, [], 'unexpected QMP event: %s' % events) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index e27b40e..e05b1d6 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -54,7 +54,9 @@ class VM(object): self._qemu_log_path = os.path.join(test_dir, 'qemu-log.%d' % os.getpid()) self._args = qemu_args + ['-chardev', 'socket,id=mon,path=' + self._monitor_path, - '-mon', 'chardev=mon,mode=control', '-nographic'] + '-mon', 'chardev=mon,mode=control', + '-qtest', 'stdio', '-machine', 'accel=qtest', + '-display', 'none', '-vga', 'none'] self._num_drives = 0 def add_drive(self, path, opts=''):