From patchwork Wed Jan 29 21:23:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356861 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE5D2159A for ; Wed, 29 Jan 2020 21:26:37 +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 5A4FA20716 for ; Wed, 29 Jan 2020 21:26:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UtQAKr2e" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A4FA20716 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwur6-0000uf-7h for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:26:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59301) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuoc-0004KA-NH for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuoa-0008IM-Qs for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:01 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23908 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuoa-0008GL-NV for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333040; 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=ZxYM/8vZCZoRvS4ov0VLdYO5xn/fDjBpklYZAqLhJLs=; b=UtQAKr2eMxfismdi+VfGEdc5SBkHeIg5A+ggiOPtftJkEdLt7BDc83A3Wnx6Xv4iOy3lFT P4OoMw7PXAuWAYiqOhXh3D9m5r5UAET9BI9NoDfQtREqdrb8D2WAHgMcCrTYkQCt5GKCiD CCBzDmxeMrqKe7hEUW689ipDQsr8eLY= 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-206-e2-A0yiFNbqDckbco-icaQ-1; Wed, 29 Jan 2020 16:23:58 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4DE36800D48; Wed, 29 Jan 2020 21:23:57 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E1A860BF3; Wed, 29 Jan 2020 21:23:54 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 01/29] hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host Date: Wed, 29 Jan 2020 22:23:17 +0100 Message-Id: <20200129212345.20547-2-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: e2-A0yiFNbqDckbco-icaQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Eduardo Habkost , Cornelia Huck , Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Commit ed65fd1a27 restricted the 'scsi' property to Linux hosts: 1261 static Property virtio_blk_properties[] = { 1262 DEFINE_BLOCK_PROPERTIES(VirtIOBlock, conf.conf), ... 1268 #ifdef __linux__ 1269 DEFINE_PROP_BIT64("scsi", VirtIOBlock, host_features, 1270 VIRTIO_BLK_F_SCSI, false), 1271 #endif When we try to set this property on a pre-2.4 machine on OSX, we get: Unexpected error in object_property_find() at qom/object.c:1201: qemu-system-x86_64: -device virtio-blk-pci,id=scsi0,drive=drive0: can't apply global virtio-blk-device.scsi=true: Property '.scsi' not found Fix this error by marking the property optional. Fixes: ed65fd1a27 Suggested-by: Cornelia Huck Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck --- hw/core/machine.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 3e288bfceb..d8e30e4895 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -148,7 +148,8 @@ GlobalProperty hw_compat_2_5[] = { const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); GlobalProperty hw_compat_2_4[] = { - { "virtio-blk-device", "scsi", "true" }, + /* Optional because the 'scsi' property is Linux-only */ + { "virtio-blk-device", "scsi", "true", .optional = true }, { "e1000", "extra_mac_registers", "off" }, { "virtio-pci", "x-disable-pcie", "on" }, { "virtio-pci", "migrate-extra", "off" }, From patchwork Wed Jan 29 21:23:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356855 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9CD11921 for ; Wed, 29 Jan 2020 21:24:54 +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 7492220702 for ; Wed, 29 Jan 2020 21:24:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gtuZDsPl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7492220702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupR-00063X-Fy for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:24:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59329) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuof-0004L8-Jq for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuoe-0008MW-Mg for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:05 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:25624 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuoe-0008MK-Jp for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333044; 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=hVzEAsn5ssLnp1bZkPwIO2os/2HRiZ8j0UbJwHtxps0=; b=gtuZDsPltoVdEHKPoHsjjjl8QRvu7TFiWzby7fTwxEGrCcjz5TBMg6ZsKMUiQSh4NTF0D2 i5/1wG6vu6yStWHyIMFAJ7vkR0DT0K2fPzLecNy6jZxM+XI0p51NcyflmuZsVbIHx0fTq8 hBq5txsI4KpwV2S/stqTECeBoPfCjv8= 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-431-6fm1zb9YMDaXT7OZ-Z1kTw-1; Wed, 29 Jan 2020 16:24:00 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BDBDB107ACC9; Wed, 29 Jan 2020 21:23:59 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BBF1560BF3; Wed, 29 Jan 2020 21:23:57 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 02/29] accel/accel: Make TYPE_ACCEL abstract Date: Wed, 29 Jan 2020 22:23:18 +0100 Message-Id: <20200129212345.20547-3-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 6fm1zb9YMDaXT7OZ-Z1kTw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" There is no generic acceleration, we have to use specific implementations. Make the base class abstract. Fixes: b14a0b7469f Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck --- accel/accel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/accel/accel.c b/accel/accel.c index cb555e3b06..a0169b4e69 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -33,6 +33,7 @@ static const TypeInfo accel_type = { .name = TYPE_ACCEL, .parent = TYPE_OBJECT, + .abstract = true, .class_size = sizeof(AccelClass), .instance_size = sizeof(AccelState), }; From patchwork Wed Jan 29 21:23:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356859 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6335F159A for ; Wed, 29 Jan 2020 21:24:57 +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 3A32C20716 for ; Wed, 29 Jan 2020 21:24:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZTUlq948" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A32C20716 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51483 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupU-00069N-Ag for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:24:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59350) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuoi-0004NE-JT for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuoh-0008OW-BF for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:08 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:29434 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuoh-0008OJ-7W for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333046; 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=CozjYogK+MTL4Nj0sSGoUCM1eCoUClPwxenFA/JCEiw=; b=ZTUlq948Hy0blVQ4forBp9jF1DWM9DCxHVB+Bzef9rsv+7B9SJvGwfG12IdnbaOnGfP1zC 3e1K9QBT3kRVlLnXqs0K7rkdpWcy0zrhtvykv54biBUh6WFS79rfhnWrGaA0/EBRdZEq6A AJ+qVQ8G9mz18SdoCx3C0MFm7r5K/6c= 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-176-YNdXmr0CMRq1nR9El42gFw-1; Wed, 29 Jan 2020 16:24:03 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 39F6010054E3; Wed, 29 Jan 2020 21:24:02 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E98060BF3; Wed, 29 Jan 2020 21:24:00 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 03/29] python/qemu: Add binutils::binary_get_version() Date: Wed, 29 Jan 2020 22:23:19 +0100 Message-Id: <20200129212345.20547-4-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: YNdXmr0CMRq1nR9El42gFw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Add a helper to query the version of a QEMU binary. We simply send the 'query-version' command over a QMP socket. Introduce the PythonQemuCoreScripts class to test our new helper. Signed-off-by: Philippe Mathieu-Daudé --- python/qemu/binutils.py | 38 ++++++++++++++++++++++++++++++++ tests/acceptance/core_scripts.py | 31 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 python/qemu/binutils.py create mode 100644 tests/acceptance/core_scripts.py diff --git a/python/qemu/binutils.py b/python/qemu/binutils.py new file mode 100644 index 0000000000..96b200eef4 --- /dev/null +++ b/python/qemu/binutils.py @@ -0,0 +1,38 @@ +""" +QEMU binary utility module: + +The binary utility module provides helpers to query QEMU binary for +build-dependent configuration options at runtime. +""" +# +# Copyright (c) 2020 Red Hat, Inc. +# +# Author: +# Philippe Mathieu-Daudé +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import logging + +from .machine import QEMUMachine + +LOG = logging.getLogger(__name__) + + +def binary_get_version(qemu_bin): + ''' + Get QEMU binary version + + @param qemu_bin (str): path to the QEMU binary + @return binary version (dictionary with major/minor/micro keys) + ''' + with QEMUMachine(qemu_bin) as vm: + vm.set_machine('none') + vm.launch() + res = vm.command('query-version') + LOG.info(res) + vm.shutdown() + return res['qemu'] diff --git a/tests/acceptance/core_scripts.py b/tests/acceptance/core_scripts.py new file mode 100644 index 0000000000..3f253337cd --- /dev/null +++ b/tests/acceptance/core_scripts.py @@ -0,0 +1,31 @@ +# Tests covering various python/qemu/ scripts +# +# Copyright (c) 2020 Red Hat, Inc. +# +# Author: +# Philippe Mathieu-Daudé +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import sys +import os +import logging + +sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) +from avocado_qemu import Test +from qemu.binutils import binary_get_version + + +class PythonQemuCoreScripts(Test): + + def test_get_version(self): + logger = logging.getLogger('core') + version = binary_get_version(self.qemu_bin) + logger.debug('version: {}'.format(version)) + # QMP 'query-version' introduced with QEMU v0.14 + self.assertGreaterEqual(version['major'], 0) + if version['major'] == 0: + self.assertGreaterEqual(version['minor'], 14) From patchwork Wed Jan 29 21:23:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356857 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 48945921 for ; Wed, 29 Jan 2020 21:24:57 +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 1ED0220702 for ; Wed, 29 Jan 2020 21:24:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gRkHQJ3q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1ED0220702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupU-00069o-5q for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:24:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59354) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuoi-0004Nd-QH for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuoh-0008Oq-MV for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:08 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39949 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuoh-0008Oa-Ik for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333047; 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=I5EhdtKtzy3iIu7t4TS1UJj5f+Zm+SWvYjiABxTxpa0=; b=gRkHQJ3qiLJuNeSR8rj97nu5DKVLtXQ0CEL+zPy6bY9w1MLAq5KZcqBOQBLCvn5Qw1y8++ fBdIuLtqyO/ZttposK+JbJxSP59gWDgSWwVMlKLOEUq0aCcFyI0uFg8hRNjzHua7L7nTLN mJIaA25sZU3ahPCDoiMIYQK+fdBkPBc= 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-253-PPVmnNFJMmyEKK0zcP4YPA-1; Wed, 29 Jan 2020 16:24:05 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B29E7800D4E; Wed, 29 Jan 2020 21:24:04 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8B4760BF3; Wed, 29 Jan 2020 21:24:02 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 04/29] tests/acceptance: Use 'version-min' tag to verify QEMU binary version Date: Wed, 29 Jan 2020 22:23:20 +0100 Message-Id: <20200129212345.20547-5-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: PPVmnNFJMmyEKK0zcP4YPA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Introduce the 'version-min' tag. Tests can set it to the minimum version of QEMU they require. If QEMU is older, the tests will be cancelled (skipped): $ python -m avocado --show=app run tests/acceptance/x86_cpu_model_versions.py (01/11) X86CPUModelAliases.test_4_0_alias_compatibility: CANCEL: Test expects version '4.1' but QEMU binary is '3.1.1' (0.10 s) (02/11) X86CPUModelAliases.test_4_1_alias: CANCEL: Test expects version '4.1' but QEMU binary is '3.1.1' (0.10 s) (03/11) X86CPUModelAliases.test_none_alias: CANCEL: Test expects version '4.1' but QEMU binary is '3.1.1' (0.10 s) ... Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/avocado_qemu/__init__.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 6618ea67c1..67c75822d5 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -19,6 +19,7 @@ import avocado SRC_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..', '..', '..') sys.path.append(os.path.join(SRC_ROOT_DIR, 'python')) +from qemu.binutils import binary_get_version from qemu.machine import QEMUMachine def is_readable_executable_file(path): @@ -111,6 +112,7 @@ class Test(avocado.Test): def setUp(self): self._vms = {} + logger = logging.getLogger('core') self.arch = self.params.get('arch', default=self._get_unique_tag_val('arch')) @@ -118,12 +120,28 @@ class Test(avocado.Test): self.machine = self.params.get('machine', default=self._get_unique_tag_val('machine')) + # Verify qemu_bin default_qemu_bin = pick_default_qemu_bin(arch=self.arch) self.qemu_bin = self.params.get('qemu_bin', default=default_qemu_bin) if self.qemu_bin is None: self.cancel("No QEMU binary defined or found in the source tree") + # Verify version + min_version = self._get_unique_tag_val('version-min') + logger.debug('version-min: {}'.format(min_version)) + if min_version: + min_v = [int(n) for n in min_version.split('.')] + if len(min_v) < 3: + min_v.append(0) + logger.debug(min_v) + bin_v = binary_get_version(self.qemu_bin) + bin_v = (bin_v['major'], bin_v['minor'], bin_v['micro']) + logger.debug(bin_v) + fmt = "Test expects version '{}' but QEMU binary is '{}.{}.{}'" + if bin_v[0] < min_v[0] or bin_v[1] < min_v[1] or bin_v[2] < min_v[2]: + self.cancel(fmt.format(min_version, bin_v[0], bin_v[1], bin_v[2])) + def _new_vm(self, *args): vm = QEMUMachine(self.qemu_bin, sock_dir=tempfile.mkdtemp()) if args: From patchwork Wed Jan 29 21:23:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356863 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4876E1398 for ; Wed, 29 Jan 2020 21:26:48 +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 1F6FE20702 for ; Wed, 29 Jan 2020 21:26:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="R5o2ndmJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F6FE20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwurH-00017B-8i for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:26:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59385) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuor-0004iz-HJ for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuoq-00006q-Bx for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:17 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24991 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuoq-000065-8a for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333055; 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=+Cvp/dJALwsoKPBLU0n7owo2QPAvy58Th+do1knti0M=; b=R5o2ndmJD5p5+K7pnzVYkxmYAMFsQ8x51/qVDBBuGMeinySVnnLboK2L8FCGt6tYJp6Quu OBvBU7xWMMwFA9KWghYh5i9NMBOQAZq9T4Zsuw1qgb9sn3jl2kMfBtd67qtwkf7Pl77Cda BAHQ8OCBU+VLBGvZSYrCwU7Y7BfPhGg= 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-63-cSZJKJhzMNm5KLkZoKYgvg-1; Wed, 29 Jan 2020 16:24:14 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 17E5C1005510; Wed, 29 Jan 2020 21:24:13 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2AB4260BF3; Wed, 29 Jan 2020 21:24:04 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 05/29] tests/acceptance: Restrict X86CPUModelAliases test to QEMU >= 4.1 Date: Wed, 29 Jan 2020 22:23:21 +0100 Message-Id: <20200129212345.20547-6-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: cSZJKJhzMNm5KLkZoKYgvg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The 'alias-of' option has been introduced with QEMU 4.1 (see commit 7d753f61544). By using the 'version-min' Avocado tag we can restrict this test to versions >= 4.1. This fixes when running the test with a older QEMU: tests/acceptance/x86_cpu_model_versions.py:X86CPUModelAliases.test_none_alias: ERROR: 'alias-of' (0.45 s) Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/x86_cpu_model_versions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/acceptance/x86_cpu_model_versions.py b/tests/acceptance/x86_cpu_model_versions.py index 90558d9a71..e7604bab7c 100644 --- a/tests/acceptance/x86_cpu_model_versions.py +++ b/tests/acceptance/x86_cpu_model_versions.py @@ -30,6 +30,7 @@ class X86CPUModelAliases(avocado_qemu.Test): Validation of PC CPU model versions and CPU model aliases :avocado: tags=arch:x86_64 + :avocado: tags=version-min:4.1 """ def validate_aliases(self, cpus): for c in cpus.values(): From patchwork Wed Jan 29 21:23:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356867 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62829159A for ; Wed, 29 Jan 2020 21:26:52 +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 38EEC20716 for ; Wed, 29 Jan 2020 21:26:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hiAiVUtn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38EEC20716 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwurL-0001GC-Dq for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:26:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59414) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuow-0004wv-6m for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuou-0000AN-NF for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:22 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:26559 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuou-00009R-Is for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333060; 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=FLv31TMeukyEv5VIAlP2E+fPgsFOq8eiqjTaqSQdDfY=; b=hiAiVUtnh3zI8IPcMQepeSeS75D016++DM4BVcaS5ONFvrkUc4zSRJAAjPLU2PibJBhM3s CC8mN1rjqMDMrOamqs9Fv7gTLaVcUahIRj5dju/ddskSrOBDa8Agv1aSQ3qaL4Ew+4krR9 of4c9Q0RJf8XO6wv8ElSMHq+nVyPJuY= 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-290-LHJnkq4fOmmcqYvqPudNMw-1; Wed, 29 Jan 2020 16:24:16 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89111477; Wed, 29 Jan 2020 21:24:15 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8C54960BF3; Wed, 29 Jan 2020 21:24:13 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 06/29] python/qemu: Add binutils::binary_get_arch() Date: Wed, 29 Jan 2020 22:23:22 +0100 Message-Id: <20200129212345.20547-7-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: LHJnkq4fOmmcqYvqPudNMw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Add a helper to query the architecture of a QEMU binary. We simply send the 'query-target' command over a QMP socket. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck --- python/qemu/binutils.py | 15 +++++++++++++++ tests/acceptance/core_scripts.py | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/python/qemu/binutils.py b/python/qemu/binutils.py index 96b200eef4..905d393ba5 100644 --- a/python/qemu/binutils.py +++ b/python/qemu/binutils.py @@ -36,3 +36,18 @@ def binary_get_version(qemu_bin): LOG.info(res) vm.shutdown() return res['qemu'] + +def binary_get_arch(qemu_bin): + ''' + Get target architecture for a QEMU binary + + @param qemu_bin (str): path to the QEMU binary + @return binary target architecture + ''' + with QEMUMachine(qemu_bin) as vm: + vm.set_machine('none') + vm.launch() + res = vm.command('query-target') + LOG.info(res) + vm.shutdown() + return res['arch'] diff --git a/tests/acceptance/core_scripts.py b/tests/acceptance/core_scripts.py index 3f253337cd..93dd822368 100644 --- a/tests/acceptance/core_scripts.py +++ b/tests/acceptance/core_scripts.py @@ -16,6 +16,7 @@ import logging sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from avocado_qemu import Test +from qemu.binutils import binary_get_arch from qemu.binutils import binary_get_version @@ -29,3 +30,13 @@ class PythonQemuCoreScripts(Test): self.assertGreaterEqual(version['major'], 0) if version['major'] == 0: self.assertGreaterEqual(version['minor'], 14) + + def test_get_arch_x86(self): + """ + :avocado: tags=arch:i386 + :avocado: tags=arch:x86_64 + """ + logger = logging.getLogger('core') + a = binary_get_arch(self.qemu_bin) + logger.debug('arch: {}'.format(a)) + self.assertIn(a, ['i386', 'x86_64']) From patchwork Wed Jan 29 21:23:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356873 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A12113A4 for ; Wed, 29 Jan 2020 21:28:35 +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 51B2B20702 for ; Wed, 29 Jan 2020 21:28:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MO5XyZ/x" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51B2B20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwut0-0004ex-H2 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:28:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59415) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuow-0004ww-5s for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuov-0000B8-1i for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:22 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:43624 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuou-00009p-U5 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333060; 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=9TkTf8IKWEO91YZjdYAA0yK6hwYHJrVi0nCZl4vTjXw=; b=MO5XyZ/xYvAL8AasduyyHtjaOJ41QAJ9SazFr4nQY2l+D7x1FaQtP3bcrNSd3SoXLlmUX0 tnpfKsIZGi8I7vJAPO66ijImiFOAV4CqC7X4yVHz3/CsG4yUh7vDWZr5bdQCq2lNDXgOaB wOhiuZrbbw6OLoCkmLy1WmCAHMrdXyQ= 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-304-3xz-PJ-UNWCu1wroy8cMFg-1; Wed, 29 Jan 2020 16:24:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F1747477; Wed, 29 Jan 2020 21:24:17 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 029C760BF3; Wed, 29 Jan 2020 21:24:15 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 07/29] tests/acceptance: Use the 'arch' tag to verify QEMU binary target Date: Wed, 29 Jan 2020 22:23:23 +0100 Message-Id: <20200129212345.20547-8-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 3xz-PJ-UNWCu1wroy8cMFg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We already use the 'arch' tag in Avocado tests. Tests can set it to restrict their use on a particular target architecture. If the QEMU binary does not target the required architecture, the tests will be cancelled (skipped): $ avocado --show=app run tests/acceptance/boot_linux_console.py ... (14/19) BootLinuxConsole.test_arm_cubieboard_initrd: CANCEL: Test expects arch 'arm' while QEMU binary is targetting 'mips' (0.16 s) (15/19) BootLinuxConsole.test_arm_cubieboard_sata: CANCEL: Test expects arch 'arm' while QEMU binary is targetting 'mips' (0.18 s) (16/19) BootLinuxConsole.test_s390x_s390_ccw_virtio: CANCEL: Test expects arch 's390x' while QEMU binary is targetting 'mips' (0.14 s) (17/19) BootLinuxConsole.test_alpha_clipper: CANCEL: Test expects arch 'alpha' while QEMU binary is targetting 'mips' (0.16 s) (18/19) BootLinuxConsole.test_ppc64_pseries: CANCEL: Test expects arch 'ppc64' while QEMU binary is targetting 'mips' (0.18 s) (19/19) BootLinuxConsole.test_m68k_q800: CANCEL: Test expects arch 'm68k' while QEMU binary is targetting 'mips' (0.17 s) RESULTS : PASS 2 | ERROR 0 | FAIL 0 | SKIP 1 | WARN 0 | INTERRUPT 0 | CANCEL 16 JOB TIME : 19.18 s Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck --- tests/acceptance/avocado_qemu/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 67c75822d5..e7d5affe24 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -19,6 +19,7 @@ import avocado SRC_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..', '..', '..') sys.path.append(os.path.join(SRC_ROOT_DIR, 'python')) +from qemu.binutils import binary_get_arch from qemu.binutils import binary_get_version from qemu.machine import QEMUMachine @@ -142,6 +143,14 @@ class Test(avocado.Test): if bin_v[0] < min_v[0] or bin_v[1] < min_v[1] or bin_v[2] < min_v[2]: self.cancel(fmt.format(min_version, bin_v[0], bin_v[1], bin_v[2])) + # Verify architecture + if self.arch: + fmt = "Test expects arch '{}' while QEMU binary is targetting '{}'" + bin_arch = binary_get_arch(self.qemu_bin) + logger.debug('arch: {}'.format(bin_arch)) + if bin_arch != self.arch: + self.cancel(fmt.format(self.arch, bin_arch)) + def _new_vm(self, *args): vm = QEMUMachine(self.qemu_bin, sock_dir=tempfile.mkdtemp()) if args: From patchwork Wed Jan 29 21:23:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356879 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 06542112B for ; Wed, 29 Jan 2020 21:30:42 +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 D1E0E20702 for ; Wed, 29 Jan 2020 21:30:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P7QCXAfz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1E0E20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuv2-0007xJ-Ub for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:30:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59441) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuoz-00055K-6e for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuoy-0000Gb-3C for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49913 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuox-0000G4-VU for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333063; 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=H3bndag2XGLaCDWDNfL+YqNeN0d28knHOx1owLB5tFo=; b=P7QCXAfzdS1JQyf+aH5EXT3G4/bUto3ErwnonVzxQEoRcKTvbigfQjxgniL3LCxeiA7nGH nrRkcvm+cJwaYt/aZA6djeyi3Ck4Fr/P4wPG75JQO2wOwYyb/W5t1CbSKG2wDV3fDu10A0 92fZlDO1ES07YanyRDC4uIMo5PQeWyw= 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-106-TscoIS3oNUqVOD40mc-Rww-1; Wed, 29 Jan 2020 16:24:21 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D289100550E; Wed, 29 Jan 2020 21:24:20 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7318960BF3; Wed, 29 Jan 2020 21:24:18 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 08/29] python/qemu: Add binutils::binary_get_machines() Date: Wed, 29 Jan 2020 22:23:24 +0100 Message-Id: <20200129212345.20547-9-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: TscoIS3oNUqVOD40mc-Rww-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Add a helper to query the list of machines built into a QEMU binary. We simply send the 'query-machines' command over a QMP socket. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck --- python/qemu/binutils.py | 15 +++++++++++++++ tests/acceptance/core_scripts.py | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/python/qemu/binutils.py b/python/qemu/binutils.py index 905d393ba5..7bb57c521b 100644 --- a/python/qemu/binutils.py +++ b/python/qemu/binutils.py @@ -51,3 +51,18 @@ def binary_get_arch(qemu_bin): LOG.info(res) vm.shutdown() return res['arch'] + +def binary_get_machines(qemu_bin): + ''' + Get list of machines supported by a QEMU binary + + @param qemu_bin (str): path to the QEMU binary + @return list of machines supported by the binary + ''' + with QEMUMachine(qemu_bin) as vm: + vm.set_machine('none') + vm.launch() + res = vm.command('query-machines') + LOG.info(res) + vm.shutdown() + return [m['name'] for m in res] diff --git a/tests/acceptance/core_scripts.py b/tests/acceptance/core_scripts.py index 93dd822368..a5b112f928 100644 --- a/tests/acceptance/core_scripts.py +++ b/tests/acceptance/core_scripts.py @@ -17,6 +17,7 @@ import logging sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from avocado_qemu import Test from qemu.binutils import binary_get_arch +from qemu.binutils import binary_get_machines from qemu.binutils import binary_get_version @@ -40,3 +41,11 @@ class PythonQemuCoreScripts(Test): a = binary_get_arch(self.qemu_bin) logger.debug('arch: {}'.format(a)) self.assertIn(a, ['i386', 'x86_64']) + + def test_get_machines(self): + logger = logging.getLogger('core') + machines = binary_get_machines(self.qemu_bin) + for m in sorted(machines): + logger.debug('machine: {}'.format(m)) + # The 'none' machine is always available + self.assertIn('none', machines) From patchwork Wed Jan 29 21:23:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356869 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF84113A4 for ; Wed, 29 Jan 2020 21:28:22 +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 C6F6E20702 for ; Wed, 29 Jan 2020 21:28:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WgPSWZqi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6F6E20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwusn-00049F-Vn for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:28:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59527) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwup8-0005S3-8i for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwup7-0000aX-1o for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:34 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:20634 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwup6-0000a7-TM for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333072; 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=wB8QA9w3gkRDqeavrH3bnAfJGucCtNtNhxG6KxdGwUY=; b=WgPSWZqi+CFCYh72C7ljbML7cGWQSfvPb5lyqqZwNGKKdpZn1Buu91W+//gv+r2L1PsbQI NU/lZyANL8eE65JsZ9JOZSfqumex2fu8/dRRHYemqPS5Cl3hbKVV9usWGsAFrL4m0XVhSt ejqnP72h3qZMbjiqLa9xgdrk5u+2sPk= 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-241-jFrrYbEpNpaE6g96EICeRg-1; Wed, 29 Jan 2020 16:24:24 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DBEF110054E3; Wed, 29 Jan 2020 21:24:22 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E302860C81; Wed, 29 Jan 2020 21:24:20 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 09/29] tests/acceptance: Use 'machine' tag to check if available in QEMU binary Date: Wed, 29 Jan 2020 22:23:25 +0100 Message-Id: <20200129212345.20547-10-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: jFrrYbEpNpaE6g96EICeRg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We already use the 'machine' tag in Avocado tests. If the requested machine is not available in the QEMU binary, the tests will be cancelled (skipped): $ python -m avocado --show=app run tests/acceptance/x86_cpu_model_versions.py ... (04/11) CascadelakeArchCapabilities.test_4_1: CANCEL: Test expects machine 'pc-i440fx-4.1' which is missing from QEMU binary (0.10 s) (05/11) CascadelakeArchCapabilities.test_4_0: CANCEL: Test expects machine 'pc-i440fx-4.0' which is missing from QEMU binary (0.11 s) ... Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck --- tests/acceptance/avocado_qemu/__init__.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index e7d5affe24..53ec8512d1 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -20,6 +20,7 @@ SRC_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..', '..', '..') sys.path.append(os.path.join(SRC_ROOT_DIR, 'python')) from qemu.binutils import binary_get_arch +from qemu.binutils import binary_get_machines from qemu.binutils import binary_get_version from qemu.machine import QEMUMachine @@ -118,9 +119,6 @@ class Test(avocado.Test): self.arch = self.params.get('arch', default=self._get_unique_tag_val('arch')) - self.machine = self.params.get('machine', - default=self._get_unique_tag_val('machine')) - # Verify qemu_bin default_qemu_bin = pick_default_qemu_bin(arch=self.arch) self.qemu_bin = self.params.get('qemu_bin', @@ -151,6 +149,15 @@ class Test(avocado.Test): if bin_arch != self.arch: self.cancel(fmt.format(self.arch, bin_arch)) + # Verify machine + self.machine = self.params.get('machine', + default=self._get_unique_tag_val('machine')) + logger.debug('machine: {}'.format(self.machine)) + if self.machine: + fmt = "Test expects machine '{}' which is missing from QEMU binary" + if self.machine not in binary_get_machines(self.qemu_bin): + self.cancel(fmt.format(self.machine)) + def _new_vm(self, *args): vm = QEMUMachine(self.qemu_bin, sock_dir=tempfile.mkdtemp()) if args: From patchwork Wed Jan 29 21:23:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356865 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 465061398 for ; Wed, 29 Jan 2020 21:26:52 +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 1DC9E20702 for ; Wed, 29 Jan 2020 21:26:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YL/KeJbN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DC9E20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwurL-0001FR-8K for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:26:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59496) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwup6-0005Mp-5d for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwup4-0000Wh-W7 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:32 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:48342 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwup4-0000Vh-SU for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333070; 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=iFb6Iha5av7utREA4X4Ytd8S+SApAb4/yVnvfLwSwcg=; b=YL/KeJbNo+JXzWW7DIoDFWZVQLH21gJMmqf8Fs8gv6qO+L+iG+Wgx/9glamhPIRoFs333X vBek7ZjGPh/7oEJvjcmbclOT1PFyYHswdrAGNI19m36Ritq+tkUV1eIs6rNDtQct4rCZq9 NgshGWD96ndlMhV9gX2Faz3CP3GxDhk= 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-27-99fCIZSWPn-JySzQbBoXew-1; Wed, 29 Jan 2020 16:24:28 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 985228010C2; Wed, 29 Jan 2020 21:24:27 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5BF1060BF3; Wed, 29 Jan 2020 21:24:23 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 10/29] python/qemu: Add binutils::binary_get_qom_implementations() Date: Wed, 29 Jan 2020 22:23:26 +0100 Message-Id: <20200129212345.20547-11-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 99fCIZSWPn-JySzQbBoXew-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Since QEMU binaries can be built with various configurations, the list of QOM objects linked can vary. Add a helper to query the list of all QOM types implementing a particular interface. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Liam Merwick --- python/qemu/binutils.py | 20 ++++++++++++++++++++ tests/acceptance/core_scripts.py | 10 ++++++++++ 2 files changed, 30 insertions(+) diff --git a/python/qemu/binutils.py b/python/qemu/binutils.py index 7bb57c521b..76f256f5d2 100644 --- a/python/qemu/binutils.py +++ b/python/qemu/binutils.py @@ -66,3 +66,23 @@ def binary_get_machines(qemu_bin): LOG.info(res) vm.shutdown() return [m['name'] for m in res] + +def binary_get_qom_implementations(qemu_bin, type_name, include_abstract=False): + ''' + Get list of QOM types implementing a particular interface + + @param qemu_bin (str): path to the QEMU binary + @param type_name (str): QOM interface name + @param include_abstract (bool): if True, abstract interfaces are also + returned in the list + @return list of QOM types implementing the interface @type_name + ''' + with QEMUMachine(qemu_bin) as vm: + vm.set_machine('none') + vm.launch() + res = vm.command('qom-list-types', + implements=type_name, + abstract=include_abstract) + LOG.info(res) + vm.shutdown() + return [m['name'] for m in res] diff --git a/tests/acceptance/core_scripts.py b/tests/acceptance/core_scripts.py index a5b112f928..c2fe4acf1d 100644 --- a/tests/acceptance/core_scripts.py +++ b/tests/acceptance/core_scripts.py @@ -18,6 +18,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from avocado_qemu import Test from qemu.binutils import binary_get_arch from qemu.binutils import binary_get_machines +from qemu.binutils import binary_get_qom_implementations from qemu.binutils import binary_get_version @@ -49,3 +50,12 @@ class PythonQemuCoreScripts(Test): logger.debug('machine: {}'.format(m)) # The 'none' machine is always available self.assertIn('none', machines) + + def test_get_qom_implementation(self): + logger = logging.getLogger('core') + type_name = "accel" + type_impl = binary_get_qom_implementations(self.qemu_bin, + type_name, True) + for t in type_impl: + logger.debug('type: {}'.format(t)) + self.assertIn(type_name, type_impl) From patchwork Wed Jan 29 21:23:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356875 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 74B3313A4 for ; Wed, 29 Jan 2020 21:28:38 +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 4C27320702 for ; Wed, 29 Jan 2020 21:28:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MXEj7nTS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C27320702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwut2-0004iL-F7 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:28:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59569) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupG-0005cv-7w for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupE-0000nn-SF for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:42 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:56774 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupE-0000nA-Oo for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333080; 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=p9/BUqYrXR/AdhcGhJKpMEvgaqrclFXB8RiepMBdAM8=; b=MXEj7nTSSHrh9eKA68X32E6RL0wqyYBFnwZe/Lm7+c7vmLfuaDfcw9JbGQsDUO/4MJ6TYE +6s7gLi0VcgkDytWZHLrWzVtwrtzP+ttx0zrY6u6O9nIOMaUcYTN/zjILhF8AIl3dA2fD3 9WjN7oMfcRHwX8SEsqR3B0cxWKluvfk= 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-394-IUsB0qhzNAGt-i8YKmqrkQ-1; Wed, 29 Jan 2020 16:24:35 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7E1B18A6EC3; Wed, 29 Jan 2020 21:24:34 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13F5360C05; Wed, 29 Jan 2020 21:24:27 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 11/29] python/qemu: Add binutils::binary_get_accels() Date: Wed, 29 Jan 2020 22:23:27 +0100 Message-Id: <20200129212345.20547-12-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: IUsB0qhzNAGt-i8YKmqrkQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Add a helper to query the list of accelerators built into a QEMU binary. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Liam Merwick --- python/qemu/binutils.py | 10 ++++++++++ tests/acceptance/core_scripts.py | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/python/qemu/binutils.py b/python/qemu/binutils.py index 76f256f5d2..bba203bc8d 100644 --- a/python/qemu/binutils.py +++ b/python/qemu/binutils.py @@ -86,3 +86,13 @@ def binary_get_qom_implementations(qemu_bin, type_name, include_abstract=False): LOG.info(res) vm.shutdown() return [m['name'] for m in res] + +def binary_get_accels(qemu_bin): + ''' + Get list of accelerators supported by a QEMU binary + + @param qemu_bin (str): path to the QEMU binary + @return list of accelerators supported by the binary + ''' + accel_types = binary_get_qom_implementations(qemu_bin, "accel", False) + return [a.strip("-accel") for a in accel_types] diff --git a/tests/acceptance/core_scripts.py b/tests/acceptance/core_scripts.py index c2fe4acf1d..7380f2f49b 100644 --- a/tests/acceptance/core_scripts.py +++ b/tests/acceptance/core_scripts.py @@ -16,6 +16,7 @@ import logging sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from avocado_qemu import Test +from qemu.binutils import binary_get_accels from qemu.binutils import binary_get_arch from qemu.binutils import binary_get_machines from qemu.binutils import binary_get_qom_implementations @@ -59,3 +60,12 @@ class PythonQemuCoreScripts(Test): for t in type_impl: logger.debug('type: {}'.format(t)) self.assertIn(type_name, type_impl) + + def test_get_accels(self): + logger = logging.getLogger('core') + accels = binary_get_accels(self.qemu_bin) + for a in accels: + logger.debug('accel: {}'.format(a)) + self.assertNotIn("accel", accels) + # qtest is always available + self.assertIn("qtest", accels) From patchwork Wed Jan 29 21:23:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356871 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 07E7713A4 for ; Wed, 29 Jan 2020 21:28:32 +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 D2E7820702 for ; Wed, 29 Jan 2020 21:28:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KF234yKm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2E7820702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwusx-0004Vi-2k for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:28:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59624) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupJ-0005oU-R8 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupI-0000zX-Mq for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:45 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:21511 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupI-0000yU-He for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333084; 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=/QoB+Io08NfOpDheh+GozLBIB+1HoMFpfftGG6ycXEM=; b=KF234yKm0VQVg1MpAvVFmvrzQGZBqaOn6M6G4WPNgrmrwWHaQ30ejzBr3aYtt4OwJ4egVB ubnJaMYtxsyhCdLCXeu6N3+Qp/LZ88/xpKa+g9z+iMbK68lzqQn6s+QGYPlYRVX1PKTn5H P/QJHqIDvr/2fBkeO9KRW654Zti91sI= 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-86-SH7pic85Pg6cVdzplIih-Q-1; Wed, 29 Jan 2020 16:24:38 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 39968100550E; Wed, 29 Jan 2020 21:24:37 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 400AC60C05; Wed, 29 Jan 2020 21:24:35 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 12/29] python/qemu/accel: Use binutils::binary_get_accels() Date: Wed, 29 Jan 2020 22:23:28 +0100 Message-Id: <20200129212345.20547-13-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: SH7pic85Pg6cVdzplIih-Q-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Instead of parsing the process help output, use the binary_get_accels() helper which queries the list of accelerators over a QMP socket. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Liam Merwick --- python/qemu/accel.py | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/python/qemu/accel.py b/python/qemu/accel.py index 0b38ddf0ab..cde51ae159 100644 --- a/python/qemu/accel.py +++ b/python/qemu/accel.py @@ -16,7 +16,8 @@ accelerators. import logging import os -import subprocess + +from .binutils import binary_get_accels LOG = logging.getLogger(__name__) @@ -27,25 +28,6 @@ ADDITIONAL_ARCHES = { "aarch64" : "armhf" } -def list_accel(qemu_bin): - """ - List accelerators enabled in the QEMU binary. - - @param qemu_bin (str): path to the QEMU binary. - @raise Exception: if failed to run `qemu -accel help` - @return a list of accelerator names. - """ - if not qemu_bin: - return [] - try: - out = subprocess.check_output([qemu_bin, '-accel', 'help'], - universal_newlines=True) - except: - LOG.debug("Failed to get the list of accelerators in %s", qemu_bin) - raise - # Skip the first line which is the header. - return [acc.strip() for acc in out.splitlines()[1:]] - def kvm_available(target_arch=None, qemu_bin=None): """ Check if KVM is available using the following heuristic: @@ -64,7 +46,7 @@ def kvm_available(target_arch=None, qemu_bin=None): if target_arch != host_arch: if target_arch != ADDITIONAL_ARCHES.get(host_arch): return False - if qemu_bin and "kvm" not in list_accel(qemu_bin): + if qemu_bin and "kvm" not in binary_get_accels(qemu_bin): return False return True @@ -74,4 +56,4 @@ def tcg_available(qemu_bin): @param qemu_bin (str): path to the QEMU binary """ - return 'tcg' in list_accel(qemu_bin) + return 'tcg' in binary_get_accels(qemu_bin) From patchwork Wed Jan 29 21:23:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356881 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6C80F14E3 for ; Wed, 29 Jan 2020 21:30:55 +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 44A7820702 for ; Wed, 29 Jan 2020 21:30:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ar3/M69T" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44A7820702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuvG-0008IX-GI for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:30:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59626) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupJ-0005oi-UR for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupI-0000zh-Nt for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:45 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37395 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupI-0000yt-Jl for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333084; 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=AYtdihKiw1InrMU7Bp2DP9tR44Uayvozpk04F0HZe78=; b=Ar3/M69TpQjg7I5vID450kXGkQiXmXnbwx7sh5/moAC9GI7k+ELPDLFAeIOLFf4ZY4DE9u wwUR3Y3vm7gicJdTw4ksO86QUPu9UxsHdfIre6vnzUGMt01NngN7D8wl62PwhlIBLZi+2F PrEMFp4rYkovtJA5Tj/smjeaQ4RyDnM= 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-217-DEiXDiHOMgKgoeoTuFFWDw-1; Wed, 29 Jan 2020 16:24:40 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A0D79800D48; Wed, 29 Jan 2020 21:24:39 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8C9460BF3; Wed, 29 Jan 2020 21:24:37 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 13/29] python/qemu: Add binutils::binary_get_devices() Date: Wed, 29 Jan 2020 22:23:29 +0100 Message-Id: <20200129212345.20547-14-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: DEiXDiHOMgKgoeoTuFFWDw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Since QEMU binaries can be built with various configurations, the list of devices linked in can vary. Add a helper to query the list of devices built into a QEMU binary. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Liam Merwick --- python/qemu/binutils.py | 9 +++++++++ tests/acceptance/core_scripts.py | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/python/qemu/binutils.py b/python/qemu/binutils.py index bba203bc8d..9633ba8efd 100644 --- a/python/qemu/binutils.py +++ b/python/qemu/binutils.py @@ -96,3 +96,12 @@ def binary_get_accels(qemu_bin): ''' accel_types = binary_get_qom_implementations(qemu_bin, "accel", False) return [a.strip("-accel") for a in accel_types] + +def binary_get_devices(qemu_bin): + ''' + Get list of devices supported by a QEMU binary + + @param qemu_bin (str): path to the QEMU binary + @return list of devices supported by the binary + ''' + return binary_get_qom_implementations(qemu_bin, "device", False) diff --git a/tests/acceptance/core_scripts.py b/tests/acceptance/core_scripts.py index 7380f2f49b..a62eb2e46b 100644 --- a/tests/acceptance/core_scripts.py +++ b/tests/acceptance/core_scripts.py @@ -18,6 +18,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from avocado_qemu import Test from qemu.binutils import binary_get_accels from qemu.binutils import binary_get_arch +from qemu.binutils import binary_get_devices from qemu.binutils import binary_get_machines from qemu.binutils import binary_get_qom_implementations from qemu.binutils import binary_get_version @@ -69,3 +70,10 @@ class PythonQemuCoreScripts(Test): self.assertNotIn("accel", accels) # qtest is always available self.assertIn("qtest", accels) + + def test_get_devices(self): + logger = logging.getLogger('core') + devices = binary_get_devices(self.qemu_bin) + for d in devices: + logger.debug('device: {}'.format(d)) + self.assertIn("migration", devices) From patchwork Wed Jan 29 21:23:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356885 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D265114E3 for ; Wed, 29 Jan 2020 21:32:51 +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 A646B20702 for ; Wed, 29 Jan 2020 21:32:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bLjUgWrK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A646B20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwux8-0002jB-Od for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:32:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59669) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupN-0005vM-17 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupL-00016U-Nu for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:48 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21950 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupL-00015p-Jy for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333087; 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=VnD9aoRab6oQ9NaFbCYY9TrtYVXwppQtRDl4lv6JVKg=; b=bLjUgWrKwHg5xGaQaM+aZqC0oTuKv+G5UXFVtkj//PeskUmEzjP9cMeTt5em5+JjnsLLhg eXVGH0z8mgJLT++3a1mELK6Q8Hxn10qR9FPj8ROPZTWSeD0BV1dDqxlBYdIQFfFD8SxmUX ugwJJ2Do7MCA7rFJVeY8/8U/BqfzU0M= 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-306-EL5qIPryPY67LZ2yqFtV8g-1; Wed, 29 Jan 2020 16:24:43 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1807E10054E3; Wed, 29 Jan 2020 21:24:42 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C7A460BF3; Wed, 29 Jan 2020 21:24:39 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [RFC PATCH v2 14/29] tests/acceptance: Use 'device' tags to check availability in QEMU binary Date: Wed, 29 Jan 2020 22:23:30 +0100 Message-Id: <20200129212345.20547-15-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: EL5qIPryPY67LZ2yqFtV8g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We already use the 'device' tag in Avocado tests. If any of the requested device is not available in the QEMU binary, the tests will be cancelled (skipped). Signed-off-by: Philippe Mathieu-Daudé --- RFC because I'm not certain, we might want to find bugs where a device is missing in the built binary... --- tests/acceptance/avocado_qemu/__init__.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 53ec8512d1..44062aea56 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -20,6 +20,7 @@ SRC_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..', '..', '..') sys.path.append(os.path.join(SRC_ROOT_DIR, 'python')) from qemu.binutils import binary_get_arch +from qemu.binutils import binary_get_devices from qemu.binutils import binary_get_machines from qemu.binutils import binary_get_version from qemu.machine import QEMUMachine @@ -158,6 +159,16 @@ class Test(avocado.Test): if self.machine not in binary_get_machines(self.qemu_bin): self.cancel(fmt.format(self.machine)) + # Verify devices + self.devices = self.tags.get('device', []) + bin_devices = binary_get_devices(self.qemu_bin) + logger.debug('devices: {}'.format(self.devices)) + fmt = "Test expects device '{}' which is missing from QEMU binary" + for dev in self.devices: + logger.debug(dev) + if dev not in bin_devices: + self.cancel(fmt.format(dev)) + def _new_vm(self, *args): vm = QEMUMachine(self.qemu_bin, sock_dir=tempfile.mkdtemp()) if args: From patchwork Wed Jan 29 21:23:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356877 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5F2E4112B for ; Wed, 29 Jan 2020 21:30:34 +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 2D31B20702 for ; Wed, 29 Jan 2020 21:30:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RRfueUGx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D31B20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuuv-0007c4-AA for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:30:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59685) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupN-0005wz-O0 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupM-00018a-P9 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:49 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:34711 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupM-00016i-Cb for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333088; 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=QAEhVlilSHEoQwZ80b+fvIYLiGexZzTICM1DESVQf1w=; b=RRfueUGxnL6gM6VnSuhWWF4W3kjUaG718dG/V59dYXZvt42jkZNzkd1zrHGSQTTcqFIA0e 3dU1MLFBhkzejRFQ8koQ1G/Nt/6M7yV01QFku5FB27wuW1qJjOdJze/6QqdPh9G6f+ne48 5MOdRHChTRi5Hgbyjeac7+CacjUZ80I= 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-100-yAbYSDP-NWCf5gNDRKzSKA-1; Wed, 29 Jan 2020 16:24:45 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 828A7DB61; Wed, 29 Jan 2020 21:24:44 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 82CAA60BF3; Wed, 29 Jan 2020 21:24:42 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 15/29] tests: rename virtio_seg_max_adjust to virtio_check_params Date: Wed, 29 Jan 2020 22:23:31 +0100 Message-Id: <20200129212345.20547-16-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: yAbYSDP-NWCf5gNDRKzSKA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Denis Plotnikov Since, virtio_seg_max_adjust checks not only seg_max, but also virtqueue_size parameter, let's make the test more general and add new parameters to be checked there in the future. Signed-off-by: Denis Plotnikov Message-Id: <20200129140702.5411-5-dplotnikov@virtuozzo.com> Signed-off-by: Philippe Mathieu-Daudé Acked-by: Cornelia Huck --- .../{virtio_seg_max_adjust.py => virtio_check_params.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/acceptance/{virtio_seg_max_adjust.py => virtio_check_params.py} (100%) diff --git a/tests/acceptance/virtio_seg_max_adjust.py b/tests/acceptance/virtio_check_params.py similarity index 100% rename from tests/acceptance/virtio_seg_max_adjust.py rename to tests/acceptance/virtio_check_params.py From patchwork Wed Jan 29 21:23:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356893 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93A0F112B for ; Wed, 29 Jan 2020 21:34:23 +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 6715620702 for ; Wed, 29 Jan 2020 21:34:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="G2GsiJa3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6715620702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuyc-00064m-It for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:34:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59733) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupS-00069D-FF for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupR-0001HA-Cv for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:54 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:57434 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupR-0001GP-9S for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333092; 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=HyYGUWUsJJCNtttCSH0oBPVnAMD7cX3BJej4nyJypFc=; b=G2GsiJa3CfP9Xd0PE7/7v2wtA8bDRqqv6hxoQtgQ5vkNeR+E7ARbXPaVgIxPI53Z3AM0Sl c7C11NNkKKJu09YwZRlyMxVdXwnIdJVFiCrr8g4JhLYTkjJJapk03pnqouheBJ69r/jLKS oz/XZ1VZQdZN3RAFlkjPL84UH2xC6GY= 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-308-DH35DtRhOb-n5KzgJApPOQ-1; Wed, 29 Jan 2020 16:24:47 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EAFF6DB60; Wed, 29 Jan 2020 21:24:46 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F14C960BF3; Wed, 29 Jan 2020 21:24:44 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 16/29] tests/acceptance/virtio_check_params: Only remove listed machines Date: Wed, 29 Jan 2020 22:23:32 +0100 Message-Id: <20200129212345.20547-17-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: DH35DtRhOb-n5KzgJApPOQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Do not remove unavailable machines, this fixes: VirtioMaxSegSettingsCheck.test_machine_types: ERROR: list.remove(x): x not in list (0.12 s) Reviewed-by: Cornelia Huck Signed-off-by: Philippe Mathieu-Daudé --- TODO check how to use attribute (Wainer) --- tests/acceptance/virtio_check_params.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index 5458573138..4a417b8ef5 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -109,14 +109,15 @@ class VirtioMaxSegSettingsCheck(Test): return False def test_machine_types(self): - # collect all machine types except 'none', 'isapc', 'microvm' + EXCLUDED_MACHINES = ['none', 'isapc', 'microvm'] + # collect all machine types except the ones in EXCLUDED_MACHINES with QEMUMachine(self.qemu_bin) as vm: vm.launch() machines = [m['name'] for m in vm.command('query-machines')] vm.shutdown() - machines.remove('none') - machines.remove('isapc') - machines.remove('microvm') + for m in EXCLUDED_MACHINES: + if m in machines: + machines.remove(m) for dev_type in DEV_TYPES: # create the list of machine types and their parameters. From patchwork Wed Jan 29 21:23:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356901 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3BC2B14E3 for ; Wed, 29 Jan 2020 21:36:23 +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 1212D20702 for ; Wed, 29 Jan 2020 21:36:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MnHOdRT4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1212D20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwv0Y-00012g-7D for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:36:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59782) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupY-0006PT-Kj for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupX-0001Tq-LP for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:00 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21055 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupX-0001TA-Hg for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:24:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333099; 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=R2Z6BCJcZiEurK9sjcERsyQFzsZbV08xWNkNQA9K3uI=; b=MnHOdRT4Fdbg94/Hf3FhD2GkuixLGfyqhGUmUTv8K6YI7DpI0QKEtzk2BMys7qXzYzyk9c n683PYWowk5k+qkWroy9z4pH5Rb4QXT1UvwNk1zEgI92CpijB8HRzLQpGt8R/0kI1XMXBR PwNRzTX8pDP9umOvUZckyywwtQWxxCE= 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-161-yTA1Rn88NJyuxxv_hi61lw-1; Wed, 29 Jan 2020 16:24:55 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0F2B1DB60; Wed, 29 Jan 2020 21:24:54 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 625FA60BF3; Wed, 29 Jan 2020 21:24:47 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 17/29] tests/acceptance/virtio_check_params: Improve exception logging Date: Wed, 29 Jan 2020 22:23:33 +0100 Message-Id: <20200129212345.20547-18-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: yTA1Rn88NJyuxxv_hi61lw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Eduardo Habkost --- tests/acceptance/virtio_check_params.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index 4a417b8ef5..51a2dd76e8 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -77,8 +77,12 @@ class VirtioMaxSegSettingsCheck(Test): vm.set_machine(mt["name"]) for s in VM_DEV_PARAMS[dev_type_name]: vm.add_args(s) - vm.launch() - query_ok, props, error = self.query_virtqueue(vm, dev_type_name) + try: + vm.launch() + query_ok, props, error = self.query_virtqueue(vm, dev_type_name) + except: + query_ok = False + error = sys.exc_info()[0] if not query_ok: self.fail('machine type {0}: {1}'.format(mt['name'], error)) From patchwork Wed Jan 29 21:23:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356883 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9AE5D112B for ; Wed, 29 Jan 2020 21:31:37 +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 71ACA20702 for ; Wed, 29 Jan 2020 21:31:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NgcDTJlj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71ACA20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuvw-0000qA-Jb for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:31:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59868) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupg-0006go-98 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupf-0001eQ-56 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:08 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:38296 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupf-0001e6-0H for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333106; 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=cXede9xAnvU2QNlS5XPZDgQCoVntfQIvKdG9jNiQE5g=; b=NgcDTJljQrnNGNu0e77ZSgIZyWzYC/4kzkNuJDEqdbS4SeQ7x56wR5mD6sFWpYOH1zD7iA NzEese+bbgjaY5uRPjlim6b8/6AyB33IrqWdL5o9MGC3v0USETWs4TKEHy3MWuho1c9hKv KMhJa4r8q3h7T+lTfKZknAomu9/SLJs= 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-410-uJ0lkRmAM4qQdb0E1jhoAw-1; Wed, 29 Jan 2020 16:24:57 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78AB718A6EC0; Wed, 29 Jan 2020 21:24:56 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CD4660BF3; Wed, 29 Jan 2020 21:24:54 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 18/29] tests/acceptance/virtio_check_params: List machine being tested Date: Wed, 29 Jan 2020 22:23:34 +0100 Message-Id: <20200129212345.20547-19-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: uJ0lkRmAM4qQdb0E1jhoAw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Add logging for easier debugging of failures: $ avocado --show=machine run tests/acceptance/virtio_check_params.py (1/1) tests/acceptance/virtio_check_params.py:VirtioMaxSegSettingsCheck.test_machine_types: machine: {'name': 'pc-i440fx-2.12', 'seg_max_adjust': 'false', 'device': 'virtio-scsi-pci'} machine: {'name': 'pc-i440fx-2.0', 'seg_max_adjust': 'false', 'device': 'virtio-scsi-pci'} machine: {'name': 'pc-q35-4.2', 'seg_max_adjust': 'false', 'device': 'virtio-scsi-pci'} machine: {'name': 'pc-i440fx-2.5', 'seg_max_adjust': 'false', 'device': 'virtio-scsi-pci'} machine: {'name': 'pc-i440fx-4.2', 'seg_max_adjust': 'false', 'device': 'virtio-scsi-pci'} ... Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck --- tests/acceptance/virtio_check_params.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index 51a2dd76e8..f679b0eec7 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -21,6 +21,7 @@ import sys import os import re +import logging sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from qemu.machine import QEMUMachine @@ -73,6 +74,9 @@ class VirtioMaxSegSettingsCheck(Test): return query_ok, props, error def check_mt(self, mt, dev_type_name): + mt['device'] = dev_type_name # Only for the debug() call. + logger = logging.getLogger('machine') + logger.debug(mt) with QEMUMachine(self.qemu_bin) as vm: vm.set_machine(mt["name"]) for s in VM_DEV_PARAMS[dev_type_name]: From patchwork Wed Jan 29 21:23:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356887 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BF019112B for ; Wed, 29 Jan 2020 21:33:01 +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 96DAA20702 for ; Wed, 29 Jan 2020 21:33:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SdbZpYFz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96DAA20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuxI-00035C-LT for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:33:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59835) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupd-0006bR-41 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupc-0001bC-1S for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:05 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:39410 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupb-0001aD-U8 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333103; 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=nQlns0iVbbE346Xpw09C6qDKAS7IAyqhFylqT1EkNFE=; b=SdbZpYFz9gFzTlQy8C6uGXHkCyJg036hyofWXSOFx3eGniQoAtvNuwGgW6Iax5nlcktLTC 12anmsXBivk53WZDAqMaEW8cCp7mGDq+fzdrVHKobQrr9jeta+xUl/apHGCsf49/71MUDu vh0WA9Ev4VYegpa3pou1SH1DRSeMczM= 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-388-jQmGLpX4NzqDgeAuvaMPxg-1; Wed, 29 Jan 2020 16:24:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E08B28017CC; Wed, 29 Jan 2020 21:24:58 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3F7460BF3; Wed, 29 Jan 2020 21:24:56 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 19/29] tests/acceptance/virtio_check_params: Only test Xen as superuser Date: Wed, 29 Jan 2020 22:23:35 +0100 Message-Id: <20200129212345.20547-20-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: jQmGLpX4NzqDgeAuvaMPxg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" When running the test unprivileged, we get: $ avocado --show=app,machine run tests/acceptance/virtio_check_params.py JOB ID : b631d5d692e49b791b211d33b80730315d561d45 JOB LOG : job-results/job-2020-01-22T17.56-b631d5d/job.log (1/1) tests/acceptance/virtio_check_params.py:VirtioMaxSegSettingsCheck.test_machine_types: machine: {'name': 'pc-i440fx-2.12', 'seg_max_adjust': 'false', 'device': 'virtio-scsi-pci'} machine: {'name': 'pc-i440fx-2.0', 'seg_max_adjust': 'false', 'device': 'virtio-scsi-pci'} machine: {'name': 'xenpv', 'seg_max_adjust': 'false', 'device': 'virtio-scsi-pci'} FAIL: machine type xenpv: (0.40 s) Looking at the job.log file we find: xencall: error: Could not obtain handle on privileged command interface: No such file or directory xen be core: xen be core: can't open xen interface Do not run this test on Xen machines if not superuser. Acked-by: Cornelia Huck Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/virtio_check_params.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index f679b0eec7..ad736bcda3 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -118,6 +118,8 @@ class VirtioMaxSegSettingsCheck(Test): def test_machine_types(self): EXCLUDED_MACHINES = ['none', 'isapc', 'microvm'] + if os.geteuid() != 0: + EXCLUDED_MACHINES += ['xenfv', 'xenpv'] # collect all machine types except the ones in EXCLUDED_MACHINES with QEMUMachine(self.qemu_bin) as vm: vm.launch() From patchwork Wed Jan 29 21:23:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356891 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 951C2112B for ; Wed, 29 Jan 2020 21:33:35 +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 6D4D7207FD for ; Wed, 29 Jan 2020 21:33:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jAMXphjC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D4D7207FD 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuxq-0004Gx-GC for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:33:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59895) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuph-0006jx-HR for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupg-0001hG-Am for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:09 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44130 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupg-0001gF-70 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333107; 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=c3iF7RTXUCdUng+9f9aD8oKOgqH0Szn6o2gMmimREsc=; b=jAMXphjCYzwnXiYcm7DLpGk7zvhb1jFiAXUS6JyP/kqptrnjFCtKzhaBqX68Z3skKaPrjJ 65vyEGZgaKFKFpbY0pYwhC3Z8u9NlvIQ6L1K0tdfNAsNc9q7Hr6ufE9mcLyfUTfDufsuDf TU4E/cMKQQPihUmI+RWwGPE7JZ0qdfE= 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-163-VWM5lc2kPPal1YLPLDVMOQ-1; Wed, 29 Jan 2020 16:25:02 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 540D0800D48; Wed, 29 Jan 2020 21:25:01 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 59DA560BF3; Wed, 29 Jan 2020 21:24:59 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 20/29] tests/acceptance/virtio_check_params: Skip test if arch is not supported Date: Wed, 29 Jan 2020 22:23:36 +0100 Message-Id: <20200129212345.20547-21-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: VWM5lc2kPPal1YLPLDVMOQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Refactor the X86 specific code. If we run this test on an architecture which is not explicitly supported, the test will be cancelled (skipped). Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/virtio_check_params.py | 37 +++++++++++++++---------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index ad736bcda3..8752e25f08 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -26,6 +26,8 @@ import logging sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from qemu.machine import QEMUMachine from avocado_qemu import Test +from qemu.binutils import binary_get_arch +from avocado.core.exceptions import TestCancel #list of machine types and virtqueue properties to test VIRTIO_SCSI_PROPS = {'seg_max_adjust': 'seg_max_adjust'} @@ -96,18 +98,21 @@ class VirtioMaxSegSettingsCheck(Test): self.assertEqual(expected_val, prop_val) @staticmethod - def seg_max_adjust_enabled(mt): - # machine types >= 5.0 should have seg_max_adjust = true - # others seg_max_adjust = false - mt = mt.split("-") + def seg_max_adjust_enabled(arch, mt): + if arch in ['i386', 'x86_64']: + # machine types >= 5.0 should have seg_max_adjust = true + # others seg_max_adjust = false + mt = mt.split("-") - # machine types with one line name and name like pc-x.x - if len(mt) <= 2: - return False + # machine types with one line name and name like pc-x.x + if len(mt) <= 2: + return False - # machine types like pc--x.x[.x] - ver = mt[2] - ver = ver.split("."); + # machine types like pc--x.x[.x] + ver = mt[2] + ver = ver.split("."); + else: + raise TestCancel('Unsupported architecture: %s' % arch) # versions >= 5.0 goes with seg_max_adjust enabled major = int(ver[0]) @@ -117,9 +122,13 @@ class VirtioMaxSegSettingsCheck(Test): return False def test_machine_types(self): - EXCLUDED_MACHINES = ['none', 'isapc', 'microvm'] - if os.geteuid() != 0: - EXCLUDED_MACHINES += ['xenfv', 'xenpv'] + arch = binary_get_arch(self.qemu_bin) + + EXCLUDED_MACHINES = ['none'] + if arch in ['i386', 'x86_64']: + EXCLUDED_MACHINES += ['isapc', 'microvm'] + if os.geteuid() != 0: + EXCLUDED_MACHINES += ['xenfv', 'xenpv'] # collect all machine types except the ones in EXCLUDED_MACHINES with QEMUMachine(self.qemu_bin) as vm: vm.launch() @@ -133,7 +142,7 @@ class VirtioMaxSegSettingsCheck(Test): # create the list of machine types and their parameters. mtypes = list() for m in machines: - if self.seg_max_adjust_enabled(m): + if self.seg_max_adjust_enabled(arch, m): enabled = 'true' else: enabled = 'false' From patchwork Wed Jan 29 21:23:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356899 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A776A112B for ; Wed, 29 Jan 2020 21:35:13 +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 7EE7620702 for ; Wed, 29 Jan 2020 21:35:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MTL4/Zsx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7EE7620702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuzP-0007bA-M5 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:35:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59908) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupi-0006m0-CY for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuph-0001je-BD for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:10 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28723 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuph-0001iZ-61 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333108; 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=fxCbZvWGXhZEqXnL1eu7ZzSOcxT178OazYB5pgkaTrA=; b=MTL4/ZsxUc1UVesPMVx4r+lu3ljMgBV+/Ccz283J7yigrdJzrj2UV4vTR7R/mLMoNKB7lt vqFegqpdYS1ks7bpJfU9N7/Meyv/4we366ZF+SGBFnZChEuZnWFII0G0vxYbKIF7fJ74xd BuOjXwFO5OCw1WzvDdi2ZuUHDqYQjHc= 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-336-BYMYJ2RPNGWprl87g9T0wQ-1; Wed, 29 Jan 2020 16:25:06 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C4D1318A6EC0; Wed, 29 Jan 2020 21:25:05 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C189F60BF3; Wed, 29 Jan 2020 21:25:01 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [RFC PATCH v2 21/29] tests/acceptance/virtio_check_params: Kludge to skip tests on MIPS Date: Wed, 29 Jan 2020 22:23:37 +0100 Message-Id: <20200129212345.20547-22-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: BYMYJ2RPNGWprl87g9T0wQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The MIPS default machine expects a BIOS. To be able to run QMP queries on the machine, we have to use the '-bios' command line option. Signed-off-by: Philippe Mathieu-Daudé --- RFC: This is not the correct place, this should be generic, or the MIPS machine need some rework. --- tests/acceptance/virtio_check_params.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index 8752e25f08..73200c9c5b 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -131,6 +131,9 @@ class VirtioMaxSegSettingsCheck(Test): EXCLUDED_MACHINES += ['xenfv', 'xenpv'] # collect all machine types except the ones in EXCLUDED_MACHINES with QEMUMachine(self.qemu_bin) as vm: + if arch.startswith('mips'): + # FIXME kludge for MIPS default machine + vm.add_args('-bios', '/dev/null') vm.launch() machines = [m['name'] for m in vm.command('query-machines')] vm.shutdown() From patchwork Wed Jan 29 21:23:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356889 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 622BA14E3 for ; Wed, 29 Jan 2020 21:33:30 +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 39AF820702 for ; Wed, 29 Jan 2020 21:33:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HEhMiHml" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39AF820702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuxl-00045B-Aw for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:33:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60000) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupq-00072q-Kg for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupo-00027E-GT for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:18 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49135 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupo-000264-By for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333116; 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=zHcKnvFMFlOZ2mkGt6IOtxw5PebUiE3muwUyy7LVCck=; b=HEhMiHmlV0jpI16Wgw3e1fz+2/fUeyKLQCJlDcl0nubbyJmImXdKXfrcSTgBCtuatDLAQY dS131xTo5WWkwYAvNUJn99XdHwEgrbiqyzQyZm13Z1j8xjrn9OWXPVZhPhmK+1yh5YTziG h+w+dG1JBt7vETmdGmpRTgBJIT9dmGk= 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-327-Yv9yRtJlNzOy6xMsG85Ixw-1; Wed, 29 Jan 2020 16:25:14 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B6358010C2; Wed, 29 Jan 2020 21:25:13 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D8FA60BF3; Wed, 29 Jan 2020 21:25:06 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 22/29] tests/acceptance/virtio_check_params: Support the s390x architecture Date: Wed, 29 Jan 2020 22:23:38 +0100 Message-Id: <20200129212345.20547-23-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Yv9yRtJlNzOy6xMsG85Ixw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We can run these tests on the s390x architecture too, we were just missing to properly parse the machine names. Suggested-by: Cornelia Huck Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/virtio_check_params.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index 73200c9c5b..b14cfb5958 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -111,6 +111,8 @@ class VirtioMaxSegSettingsCheck(Test): # machine types like pc--x.x[.x] ver = mt[2] ver = ver.split("."); + elif arch == 's390x': + ver = mt[len('s390-ccw-virtio-'):].split('.') else: raise TestCancel('Unsupported architecture: %s' % arch) From patchwork Wed Jan 29 21:23:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356897 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8DD0B14E3 for ; Wed, 29 Jan 2020 21:35:07 +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 64E5720702 for ; Wed, 29 Jan 2020 21:35:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VBg5Tpo4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64E5720702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuzK-0007Qf-Kh for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:35:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60028) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwups-00075W-8Z for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupq-0002Eq-VI for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:20 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:20034 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupq-0002Bu-FA for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333118; 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=zT+uuh6avARiNQsN/PIYvN90hkJck+KhsDfZiEfl+bE=; b=VBg5Tpo4BBq47qPQofUWSSWCW+BObunFpSlWOb1kybqEAjf7toBslMuTkhX40tXCw4eLS2 LprXnZ5ldTXX74fJzL6AXHPxTJtth4jpWDAzQLBxYc+CxWMPVqAezaYR3AKalppoT/ZU8Y YQ97IyeJHXxabIaiveaDEI5GnXSxVDA= 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-179-Xo6aUt6ONDCDKsK3VPt0yQ-1; Wed, 29 Jan 2020 16:25:16 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78411800D4E; Wed, 29 Jan 2020 21:25:15 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7EB7A60BF3; Wed, 29 Jan 2020 21:25:13 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 23/29] tests/acceptance/virtio_check_params: Support the ppc architecture Date: Wed, 29 Jan 2020 22:23:39 +0100 Message-Id: <20200129212345.20547-24-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Xo6aUt6ONDCDKsK3VPt0yQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We can run these tests on the pSeries machines too, we were just missing to properly parse the machine names. Note: we have to exclude the versioned machines from QEMU 2.8 to 2.11 which fail, such: TestFail: machine type pseries-2.8: No Transactional Memory support in TCG, try appending -machine cap-htm=off Suggested-by: Cornelia Huck Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/virtio_check_params.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index b14cfb5958..2c14af825d 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -113,6 +113,8 @@ class VirtioMaxSegSettingsCheck(Test): ver = ver.split("."); elif arch == 's390x': ver = mt[len('s390-ccw-virtio-'):].split('.') + elif arch.startswith('ppc'): + ver = mt[len('pseries-'):].split('.') else: raise TestCancel('Unsupported architecture: %s' % arch) @@ -131,6 +133,9 @@ class VirtioMaxSegSettingsCheck(Test): EXCLUDED_MACHINES += ['isapc', 'microvm'] if os.geteuid() != 0: EXCLUDED_MACHINES += ['xenfv', 'xenpv'] + elif arch.startswith('ppc'): + EXCLUDED_MACHINES += ['pseries-2.8', 'pseries-2.9', + 'pseries-2.10', 'pseries-2.11'] # collect all machine types except the ones in EXCLUDED_MACHINES with QEMUMachine(self.qemu_bin) as vm: if arch.startswith('mips'): @@ -142,6 +147,8 @@ class VirtioMaxSegSettingsCheck(Test): for m in EXCLUDED_MACHINES: if m in machines: machines.remove(m) + if arch.startswith('ppc'): + machines = [m for m in machines if m.startswith('pseries')] for dev_type in DEV_TYPES: # create the list of machine types and their parameters. From patchwork Wed Jan 29 21:23:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356895 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E0748112B for ; Wed, 29 Jan 2020 21:34:41 +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 B78EF20702 for ; Wed, 29 Jan 2020 21:34:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QhvpILCd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B78EF20702 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuyu-0006Tm-Rn for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:34:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60060) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupw-0007Dw-0u for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupu-0002Qc-VR for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:23 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34068 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupu-0002OW-R6 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333122; 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=cXcVC77YOLB0xyx7AypnYrGKPm12vH6HbD8K8wr1Eo8=; b=QhvpILCdWH4c5Ar+ageBSQBHA5WGut/R1LMG9t4TYBBIanvvS5+5WmXEGBgERjh1Zk4QPl CNvzfZUijPN71/p2mzo/wgBfA09ttoTJ+qnbE63KiL8WB+X5h2zwdEc2QJzOC8UjVnudOG QZpbpVeUfdm0GUuVr2BCukvfXtKjT80= 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-310-FXSOEKH7ND-KlXBUL6SUzw-1; Wed, 29 Jan 2020 16:25:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E88EE8010C2; Wed, 29 Jan 2020 21:25:17 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEA6660BF3; Wed, 29 Jan 2020 21:25:15 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 24/29] tests/acceptance/virtio_check_params: Default to -nodefaults Date: Wed, 29 Jan 2020 22:23:40 +0100 Message-Id: <20200129212345.20547-25-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: FXSOEKH7ND-KlXBUL6SUzw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We don't need the default options to run this test. This fixes errors when running a binary built with --without-default-devices such: ERROR: qemu-system-s390x: Unknown device 'virtio-net-ccw' for bus 'virtual-css-bus' Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- tests/acceptance/virtio_check_params.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index 2c14af825d..3466aa5b32 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -81,6 +81,7 @@ class VirtioMaxSegSettingsCheck(Test): logger.debug(mt) with QEMUMachine(self.qemu_bin) as vm: vm.set_machine(mt["name"]) + vm.add_args('-nodefaults') for s in VM_DEV_PARAMS[dev_type_name]: vm.add_args(s) try: From patchwork Wed Jan 29 21:23:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356903 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E6B6A112B for ; Wed, 29 Jan 2020 21:37:00 +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 BD7B6206F0 for ; Wed, 29 Jan 2020 21:37:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UJVtwhT9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD7B6206F0 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwv19-0002SC-Th for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:36:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60072) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwupw-0007FE-RK for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupv-0002S5-NM for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:24 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44475 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupv-0002R9-IB for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333123; 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=z1YPxrH/NEwLU/qG9sunz38BY6jEll2Q5sPq0M4BS4g=; b=UJVtwhT9T4U4HerIPsbu2A6iSLe0zU6C09jinFzt1s8cvbtcyll/Ot/PEXniqfvfts7sCY tSdgTxTETmOu+RoQUQgYB33oHIxf+w8Ji7BAp/3K2iH97bVHcuNXJGVM2C5TFCAV0bNdwi YOgv6gktngwu1Z6AvvXTh/k5fMpvVwY= 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-276-f23z-rCONniScigDas1fbQ-1; Wed, 29 Jan 2020 16:25:21 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C4EA477; Wed, 29 Jan 2020 21:25:20 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 60B7E60BF3; Wed, 29 Jan 2020 21:25:18 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 25/29] tests/acceptance/virtio_check_params: Require a virtio-scsi-pci device Date: Wed, 29 Jan 2020 22:23:41 +0100 Message-Id: <20200129212345.20547-26-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: f23z-rCONniScigDas1fbQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" When running this test with QEMU configured using --without-default-devices, we get: ERROR: qemu-system-s390x: -device virtio-scsi-pci,id=scsi0: 'virtio-scsi-pci' is not a valid device model name To be able to run the acceptance tests with a binary built using --without-default-devices, add a 'device' tag. The Test::setUp() method will verify the device is available, else cancel (skip) the test. Signed-off-by: Philippe Mathieu-Daudé --- tests/acceptance/virtio_check_params.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py index 3466aa5b32..95a9048786 100755 --- a/tests/acceptance/virtio_check_params.py +++ b/tests/acceptance/virtio_check_params.py @@ -44,6 +44,9 @@ VM_DEV_PARAMS = {'virtio-scsi-pci': ['-device', 'virtio-scsi-pci,id=scsi0'], class VirtioMaxSegSettingsCheck(Test): + """ + :avocado: tags=device:virtio-scsi-pci + """ @staticmethod def make_pattern(props): pattern_items = ['{0} = \w+'.format(prop) for prop in props] From patchwork Wed Jan 29 21:23:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356907 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 83C47112B for ; Wed, 29 Jan 2020 21:38:42 +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 5A3DA206F0 for ; Wed, 29 Jan 2020 21:38:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I69nZvKn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A3DA206F0 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwv2n-0004qM-Gr for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:38:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60107) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuq0-0007NA-Rg for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwupz-0002oz-PZ for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:28 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:40180 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwupz-0002me-LY for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333127; 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=GnTDfFyZr5rQXmPPqtWagLDBvm482MijwJf3ly6uCs8=; b=I69nZvKniZCx3XAkn1T0N3xiZ9c5atstUObmiRhRvx4NqERUdXSPk6d+PHV01k9ItIrdjp wg2m9o8/DTIabI3Rhq5AYtxjthK9sVV5wWOEEO67JVdfuf5mmJWyCV40pxUCSPglTsiK16 R1nRSjraKAKzjrFw0jJdqTWG2cdzAmo= 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-327-Ywol_xTcPr6YZsZHL97aCA-1; Wed, 29 Jan 2020 16:25:23 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C12688017CC; Wed, 29 Jan 2020 21:25:22 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C61A360BF3; Wed, 29 Jan 2020 21:25:20 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 26/29] tests/acceptance/boot_linux_console: Do not use VGA on Clipper machine Date: Wed, 29 Jan 2020 22:23:42 +0100 Message-Id: <20200129212345.20547-27-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Ywol_xTcPr6YZsZHL97aCA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" As we only read the serial console, we don't need to force a VGA display. This fixes when running a binary built with --without-default-devices: ERROR: qemu-system-alpha: standard VGA not available We also need the '-nodefaults' argument to avoid: ERROR: qemu-system-alpha: Unsupported NIC model: e1000 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- tests/acceptance/boot_linux_console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index e40b84651b..7d6065828c 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -519,7 +519,7 @@ class BootLinuxConsole(Test): self.vm.set_console() kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyS0' - self.vm.add_args('-vga', 'std', + self.vm.add_args('-nodefaults', '-kernel', uncompressed_kernel, '-append', kernel_command_line) self.vm.launch() From patchwork Wed Jan 29 21:23:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356911 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 972CE14E3 for ; Wed, 29 Jan 2020 21:39:42 +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 6D963206F0 for ; Wed, 29 Jan 2020 21:39:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="R/xes4cT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D963206F0 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwv3l-0006OJ-Lg for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:39:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60119) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuq1-0007OP-Bz for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuq0-0002t3-E6 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:29 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:59237 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuq0-0002qI-9r for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333127; 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=3RgfhbTdW/N69ju8x61MEPmXC48AqPEUH+WU3+4iKWA=; b=R/xes4cT2J99tbAFb4FSjdqw1bpKnq833If/bRvshTh4wDv7b5jHccdLLEQwk8j1j6XoXG pCx1YxNHgo2hNbggHu1lU49reyp9s1TpHkGqQpGKFWF/W/KX4jhqhXCripYGUKke03not1 iks3f3SdDF4gH8TcYWw5c/GmO7w0L3M= 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-404-ifms6K_HNY6hM2bHC8FTSQ-1; Wed, 29 Jan 2020 16:25:26 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3EE678017CC; Wed, 29 Jan 2020 21:25:25 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 39D9D60BF3; Wed, 29 Jan 2020 21:25:23 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 27/29] tests/acceptance/migration: Default to -nodefaults Date: Wed, 29 Jan 2020 22:23:43 +0100 Message-Id: <20200129212345.20547-28-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: ifms6K_HNY6hM2bHC8FTSQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We don't need the default options to run this test. This fixes errors when running a binary built with --without-default-devices such: ERROR: qemu-system-arm: Unsupported NIC model: virtio-net-pci Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta --- tests/acceptance/migration.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py index a44c1ae58f..d09e5d3fe7 100644 --- a/tests/acceptance/migration.py +++ b/tests/acceptance/migration.py @@ -32,10 +32,12 @@ class Migration(Test): def test_migration_with_tcp_localhost(self): - source_vm = self.get_vm() dest_uri = 'tcp:localhost:%u' % self._get_free_port() dest_vm = self.get_vm('-incoming', dest_uri) + dest_vm.add_args('-nodefaults') dest_vm.launch() + source_vm = self.get_vm() + source_vm.add_args('-nodefaults') source_vm.launch() source_vm.qmp('migrate', uri=dest_uri) wait.wait_for( From patchwork Wed Jan 29 21:23:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356905 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9FFB214E3 for ; Wed, 29 Jan 2020 21:37:08 +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 763B5206F0 for ; Wed, 29 Jan 2020 21:37:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AmuyO9UG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 763B5206F0 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwv1H-0002gU-LP for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:37:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60206) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuqA-0007mk-Qc for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuq9-0003JV-S5 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:38 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:41724 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuq9-0003Hy-Nh for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333137; 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=uiedpZTv7GmUSWFb2P5HHTvKQsPxGrqU0L3xrq+7LT8=; b=AmuyO9UGs8hYh2RyvqpZd1ik60uDCtz0n8p+GYfN+iSqbRu6ELtiKbGP1QZZNzVrccR2xy ScJocB7RAXuiWgvsvmorFZCOJtxBW2peb8IQAeGgE8JZBDxAGbA5xe4+xylXn6w3udsIsT wwwTqfT+mHvjiiXLlgk4YDGLrxHk1kQ= 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-374-niuQ9ddZOKWiXaAOunKqCw-1; Wed, 29 Jan 2020 16:25:33 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C18D018A6EC1; Wed, 29 Jan 2020 21:25:32 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD56160BF3; Wed, 29 Jan 2020 21:25:25 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 28/29] tests/acceptance/version: Default to -nodefaults Date: Wed, 29 Jan 2020 22:23:44 +0100 Message-Id: <20200129212345.20547-29-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: niuQ9ddZOKWiXaAOunKqCw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We don't need the default options to run this test. This fixes errors when running a binary built with --without-default-devices such: ERROR: qemu-system-arm: Unsupported NIC model: virtio-net-pci Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta --- tests/acceptance/version.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/acceptance/version.py b/tests/acceptance/version.py index 67c2192c93..79b923d4fc 100644 --- a/tests/acceptance/version.py +++ b/tests/acceptance/version.py @@ -17,6 +17,7 @@ class Version(Test): :avocado: tags=quick """ def test_qmp_human_info_version(self): + self.vm.add_args('-nodefaults') self.vm.launch() res = self.vm.command('human-monitor-command', command_line='info version') From patchwork Wed Jan 29 21:23:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11356913 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 153F2112B for ; Wed, 29 Jan 2020 21:40:35 +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 DFD33206F0 for ; Wed, 29 Jan 2020 21:40:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U0A2knKN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DFD33206F0 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwv4c-0007Js-5A for patchwork-qemu-devel@patchwork.kernel.org; Wed, 29 Jan 2020 16:40:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60232) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwuqD-0007uP-Gd for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwuqC-0003NW-Gb for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:41 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58647 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwuqC-0003Mg-CY for qemu-devel@nongnu.org; Wed, 29 Jan 2020 16:25:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580333140; 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=z0U47tvFxOBzjdEvYY6tVm4z3s5nPc5bzYEYKuKCinc=; b=U0A2knKNPytK90pIBOTWxbu8eq4HoQFIEoWuZBJpZ7yVZrLpSEEop6JBd3HrgcgRL9AWS7 vFX+3ohKS5FohkoIJZTkIc5a0AVDswHw2Wr6A9rEC9Q7wSA7e8sAE039rOvnPT/NjePQoQ 6TArVce7ZlIfo/bt9zu8gkuQS6calu4= 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-316-q-10GR83OHOIhk3muljHnw-1; Wed, 29 Jan 2020 16:25:36 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 38B6218A6EC1; Wed, 29 Jan 2020 21:25:35 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-184.brq.redhat.com [10.40.205.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3AD0D60BF3; Wed, 29 Jan 2020 21:25:33 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Denis Plotnikov , qemu-devel@nongnu.org Subject: [PATCH v2 29/29] MAINTAINERS: Add Acceptance tests reviewers Date: Wed, 29 Jan 2020 22:23:45 +0100 Message-Id: <20200129212345.20547-30-philmd@redhat.com> In-Reply-To: <20200129212345.20547-1-philmd@redhat.com> References: <20200129212345.20547-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: q-10GR83OHOIhk3muljHnw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Wainer dos Santos Moschetta , Cleber Rosa Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Acceptance tests can test any piece of the QEMU codebase. As such, the directory holding them does not belong to a specific subsystem with designated maintainers. Each subsystem covered by a test is welcomed to add the test path to its section. See for example commits 71b290e70, b11785ca2 or 5d480ddde. Since Eduardo, Cleber and Philippe have been reviewing the patches on the list, add them as reviewers. Signed-off-by: Philippe Mathieu-Daudé --- Cc: Wainer dos Santos Moschetta Wainer do you want to be listed? --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index efd3f3875f..4a3cc3f137 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2733,6 +2733,12 @@ S: Maintained F: tests/tcg/Makefile F: tests/tcg/Makefile.include +Acceptance Tests +R: Eduardo Habkost +R: Cleber Rosa +R: Philippe Mathieu-Daudé +F: tests/acceptance/ + Documentation ------------- Build system architecture