From nobody Sun Feb 8 07:21:44 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606759556; cv=none; d=zohomail.com; s=zohoarc; b=MLUuvWThhDq3wIC5osyM8nmJXC1gohwXTeSSk1rJxHmMQHe23Vhik5nA9Raj+v/CoYx9Etr9zEgvheApqVJ0Q+5BYUr0at1Ey2WjM/D5ChPr0bgZw52U/lEzcqsLAzX8Y1mn8zHXxTZV7dhzTA8Is5iwrYwfJIuUG8v/xVXJKQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606759556; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HJBLO45wA6NYq5dT/+jLafQoiG9p+nIz3j+RYW+mq84=; b=EnHgQ4zXuSvlbsdK6KfO2pZUh2Vsv4Q0Pn95K/sQmlitvBNXsE7hEdz/cjEAIR5e4HmRbPxgg6SrnvPe+7JYmqjBj34R5svsf1nIZbuHDx7HJc/DmCbNUAJSzsHiZVhDn4J5OPrC6nOK2vXUHrUfvngTmFu2QrdVs52eHRuL1eU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606759556431875.4032549177308; Mon, 30 Nov 2020 10:05:56 -0800 (PST) Received: from localhost ([::1]:52366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjnYg-0002sp-Ag for importer@patchew.org; Mon, 30 Nov 2020 13:05:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjnVa-0008F0-Bp for qemu-devel@nongnu.org; Mon, 30 Nov 2020 13:02:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20379) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kjnVT-0007Wf-Nj for qemu-devel@nongnu.org; Mon, 30 Nov 2020 13:02:41 -0500 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-81-5XokLhnRNrKF6erCUMckxw-1; Mon, 30 Nov 2020 13:02:28 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CCF48030AB; Mon, 30 Nov 2020 18:02:27 +0000 (UTC) Received: from gondolin.redhat.com (ovpn-113-87.ams2.redhat.com [10.36.113.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29CBB19C71; Mon, 30 Nov 2020 18:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606759355; 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=HJBLO45wA6NYq5dT/+jLafQoiG9p+nIz3j+RYW+mq84=; b=Bai1OXBDxlV1YA1/HlKbaJCVKuC96NGKmBnb5nqDZuEHavOS7EepaNvWplgfde5rYjU0Td JqkwOufuA5g+ZnTfK/7GajfUOEnJjaYsCZy6hx5UgFJLS61KM7eQcUr6qsvE4K/FLqWUSR uqih7cdissNNNURlPKAydNwTs9B3Cb0= X-MC-Unique: 5XokLhnRNrKF6erCUMckxw-1 From: Cornelia Huck To: qemu-devel@nongnu.org Subject: [PATCH 1/3] tests/acceptance: test virtio-ccw revision handling Date: Mon, 30 Nov 2020 19:02:14 +0100 Message-Id: <20201130180216.15366-2-cohuck@redhat.com> In-Reply-To: <20201130180216.15366-1-cohuck@redhat.com> References: <20201130180216.15366-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.496, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Cornelia Huck , Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The max_revision prop of virtio-ccw devices can be used to force an older revision for compatibility handling. The easiest way to check this is to force a device to revision 0, which turns off virtio-1. Signed-off-by: Cornelia Huck Reviewed-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta --- tests/acceptance/machine_s390_ccw_virtio.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance= /machine_s390_ccw_virtio.py index db6352c44434..683b6e0dac2e 100644 --- a/tests/acceptance/machine_s390_ccw_virtio.py +++ b/tests/acceptance/machine_s390_ccw_virtio.py @@ -51,6 +51,10 @@ class S390CCWVirtioMachine(Test): '-initrd', initrd_path, '-append', kernel_command_line, '-device', 'virtio-net-ccw,devno=3Dfe.1.1111', + '-device', + 'virtio-rng-ccw,devno=3Dfe.2.0000,max_revision=3D= 0', + '-device', + 'virtio-rng-ccw,devno=3Dfe.3.1234,max_revision=3D= 2', '-device', 'zpci,uid=3D5,target=3Dzzz', '-device', 'virtio-net-pci,id=3Dzzz') self.vm.launch() @@ -60,9 +64,19 @@ class S390CCWVirtioMachine(Test): # first debug shell is too early, we need to wait for device detec= tion exec_command_and_wait_for_pattern(self, 'exit', shell_ready) =20 - ccw_bus_id=3D"0.1.1111" + ccw_bus_ids=3D"0.1.1111 0.2.0000 0.3.1234" pci_bus_id=3D"0005:00:00.0" exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/', - ccw_bus_id) + ccw_bus_ids) exec_command_and_wait_for_pattern(self, 'ls /sys/bus/pci/devices/', pci_bus_id) + # check that the device at 0.2.0000 is in legacy mode, while the + # device at 0.3.1234 has the virtio-1 feature bit set + virtio_rng_features=3D"0000000000000000000000000000110010000000000= 000000000000000000000" + virtio_rng_features_legacy=3D"000000000000000000000000000011000000= 0000000000000000000000000000" + exec_command_and_wait_for_pattern(self, + 'cat /sys/bus/ccw/devices/0.2.00= 00/virtio?/features', + virtio_rng_features_legacy) + exec_command_and_wait_for_pattern(self, + 'cat /sys/bus/ccw/devices/0.3.12= 34/virtio?/features', + virtio_rng_features) --=20 2.26.2 From nobody Sun Feb 8 07:21:44 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606759658; cv=none; d=zohomail.com; s=zohoarc; b=l96OHesQIHmaQ0QASnMNjAtik0kXO6MhmRYEVSAH8K09hvuzi+SyMYw9kLWUCzln8IRvzcfsg0TWlsYf+282O5CpmowhWtx9/ISHFAhsuvtF8xtYkaXoQD2tB0RWfM/5jAJF4rQInvMD8qcLP0WZwXWR7qsI6mNyIm3sd0sKYTg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606759658; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Koj10X8OEKGbUD/qoTfB9mTKYbuXOXBfjkkStsf9BQY=; b=h9gMs38s8E/5TZKt/szZO7br6hQToiZTY6Hdo01yUbHcTK+w1HpTLG4AIgzmCRJ3ndR25i4sTzes/bshHXNkdXY2Asb7psIcUK6vsTlVCbL/HcrpxRfnTG7T7U3JzjmeOeRqtpbQ27yuZ8QEoWu+A1//GVgCPrJRzTik5VIx12k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606759658636409.13182684580954; Mon, 30 Nov 2020 10:07:38 -0800 (PST) Received: from localhost ([::1]:55636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjnaL-0004SC-Gz for importer@patchew.org; Mon, 30 Nov 2020 13:07:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjnVY-0008EQ-Nd for qemu-devel@nongnu.org; Mon, 30 Nov 2020 13:02:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kjnVT-0007WT-JO for qemu-devel@nongnu.org; Mon, 30 Nov 2020 13:02:40 -0500 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-373-Hs3Vld8uMBeABDSml8WnyQ-1; Mon, 30 Nov 2020 13:02:30 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 39F8A180A08A; Mon, 30 Nov 2020 18:02:29 +0000 (UTC) Received: from gondolin.redhat.com (ovpn-113-87.ams2.redhat.com [10.36.113.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59C8E19D7D; Mon, 30 Nov 2020 18:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606759354; 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=Koj10X8OEKGbUD/qoTfB9mTKYbuXOXBfjkkStsf9BQY=; b=iULz0F/GvQeUBNy1PA5GEBHiBgkmy6D81iJNxWLNRpwDhDZgZ3wpvZgvLe7ryOiYtE/xJM YJZGOl2+FZZKmkGraF+JDbNEU53Q9XrDAIYOfRKHhfyIxwrzT0XeFzzvYJQZUzj9INMzn+ 4N6FitXx3M5QrKQqyQjzEawS8fmFAg0= X-MC-Unique: Hs3Vld8uMBeABDSml8WnyQ-1 From: Cornelia Huck To: qemu-devel@nongnu.org Subject: [PATCH 2/3] tests/acceptance: verify s390x device detection Date: Mon, 30 Nov 2020 19:02:15 +0100 Message-Id: <20201130180216.15366-3-cohuck@redhat.com> In-Reply-To: <20201130180216.15366-1-cohuck@redhat.com> References: <20201130180216.15366-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.496, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Cornelia Huck , Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The kernel/initrd combination does not provide the virtio-net driver; therefore, simply check whether the presented device type is indeed virtio-net for the two virtio-net-{ccw,pci} devices. Signed-off-by: Cornelia Huck Reviewed-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta --- tests/acceptance/machine_s390_ccw_virtio.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance= /machine_s390_ccw_virtio.py index 683b6e0dac2e..e203ee304264 100644 --- a/tests/acceptance/machine_s390_ccw_virtio.py +++ b/tests/acceptance/machine_s390_ccw_virtio.py @@ -80,3 +80,14 @@ class S390CCWVirtioMachine(Test): exec_command_and_wait_for_pattern(self, 'cat /sys/bus/ccw/devices/0.3.12= 34/virtio?/features', virtio_rng_features) + # verify that we indeed have virtio-net devices (without having the + # virtio-net driver handy) + exec_command_and_wait_for_pattern(self, + 'cat /sys/bus/ccw/devices/0.1.11= 11/cutype', + '3832/01') + exec_command_and_wait_for_pattern(self, + 'cat /sys/bus/pci/devices/0005\:= 00\:00.0/subsystem_vendor', + '0x1af4') + exec_command_and_wait_for_pattern(self, + 'cat /sys/bus/pci/devices/0005\:= 00\:00.0/subsystem_device', + '0x0001') --=20 2.26.2 From nobody Sun Feb 8 07:21:44 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606759726; cv=none; d=zohomail.com; s=zohoarc; b=gMWIA/Mc032xR0Tv7LbKfskHWTHp4rD1Ex8KKCcjoevD6yBnwlGsHLOH+hWiOxe7E8J+MH0TeBvISpg7ywxx2ZrcHShIeEZFZiq+MktvSPG7Dd5RShT3H7vktl8C1+i61KgElQ8ZVH1pBpaqXhCfpCUBIymJJLIMfm4STdjA1YM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606759726; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K2eud7xxytAY9EEZGN8wvqAsEJjJuurmnuwG2Y6YteM=; b=Vrjgj+h56ph9E8P4VtvG4eBLjRUDLgosRTfO4L8acyG07cK6824wFN1moQQEtRWnkjCTPdLymFK9Fvu0TWEY6EQF0JKxGdlxCZASabe/JM5vwrJRLPLWPFbYGaSeDhW/ZzyNg3QMV/dI5Iu85VdvzLViGMWAO8k3uZRziIjZDjU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606759726874924.3589058870025; Mon, 30 Nov 2020 10:08:46 -0800 (PST) Received: from localhost ([::1]:47726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjnWb-0000s8-Ct for importer@patchew.org; Mon, 30 Nov 2020 13:03:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjnVY-0008EN-F8 for qemu-devel@nongnu.org; Mon, 30 Nov 2020 13:02:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kjnVT-0007WU-9H for qemu-devel@nongnu.org; Mon, 30 Nov 2020 13:02:40 -0500 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-47-xt3hCpJQO6O6xL7GKhpayA-1; Mon, 30 Nov 2020 13:02:32 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69B49817B89; Mon, 30 Nov 2020 18:02:31 +0000 (UTC) Received: from gondolin.redhat.com (ovpn-113-87.ams2.redhat.com [10.36.113.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87BEF19C71; Mon, 30 Nov 2020 18:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606759354; 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=K2eud7xxytAY9EEZGN8wvqAsEJjJuurmnuwG2Y6YteM=; b=Errg6atrOn9tsLma9kw5xu8S/ucPdbEOY5mtr2c1UmpADsMgjLpwSVy+DYosVyAe5fqMvP uxYKAflY5aiSdsGuN9lp6p1+pHEk64N8CTJpIFN2XRKh+tpLSFLyZ/qtV5r6Ge6mx1lrjv 0gCCyc1xzsdpnPiy1pLObNBHsoUgars= X-MC-Unique: xt3hCpJQO6O6xL7GKhpayA-1 From: Cornelia Huck To: qemu-devel@nongnu.org Subject: [PATCH 3/3] tests/acceptance: test s390x zpci fid propagation Date: Mon, 30 Nov 2020 19:02:16 +0100 Message-Id: <20201130180216.15366-4-cohuck@redhat.com> In-Reply-To: <20201130180216.15366-1-cohuck@redhat.com> References: <20201130180216.15366-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=cohuck@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.496, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Cornelia Huck , Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Verify that a fid specified on the command line shows up correctly as the function_id in the guest. Signed-off-by: Cornelia Huck Reviewed-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta --- tests/acceptance/machine_s390_ccw_virtio.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance= /machine_s390_ccw_virtio.py index e203ee304264..53b8484f8f9c 100644 --- a/tests/acceptance/machine_s390_ccw_virtio.py +++ b/tests/acceptance/machine_s390_ccw_virtio.py @@ -56,7 +56,9 @@ class S390CCWVirtioMachine(Test): '-device', 'virtio-rng-ccw,devno=3Dfe.3.1234,max_revision=3D= 2', '-device', 'zpci,uid=3D5,target=3Dzzz', - '-device', 'virtio-net-pci,id=3Dzzz') + '-device', 'virtio-net-pci,id=3Dzzz', + '-device', 'zpci,uid=3D0xa,fid=3D12,target=3Dseri= al', + '-device', 'virtio-serial-pci,id=3Dserial') self.vm.launch() =20 shell_ready =3D "sh: can't access tty; job control turned off" @@ -65,11 +67,11 @@ class S390CCWVirtioMachine(Test): exec_command_and_wait_for_pattern(self, 'exit', shell_ready) =20 ccw_bus_ids=3D"0.1.1111 0.2.0000 0.3.1234" - pci_bus_id=3D"0005:00:00.0" + pci_bus_ids=3D"0005:00:00.0 000a:00:00.0" exec_command_and_wait_for_pattern(self, 'ls /sys/bus/ccw/devices/', ccw_bus_ids) exec_command_and_wait_for_pattern(self, 'ls /sys/bus/pci/devices/', - pci_bus_id) + pci_bus_ids) # check that the device at 0.2.0000 is in legacy mode, while the # device at 0.3.1234 has the virtio-1 feature bit set virtio_rng_features=3D"0000000000000000000000000000110010000000000= 000000000000000000000" @@ -91,3 +93,7 @@ class S390CCWVirtioMachine(Test): exec_command_and_wait_for_pattern(self, 'cat /sys/bus/pci/devices/0005\:= 00\:00.0/subsystem_device', '0x0001') + # check fid propagation + exec_command_and_wait_for_pattern(self, + 'cat /sys/bus/pci/devices/000a\:= 00\:00.0/function_id', + '0x0000000c') --=20 2.26.2