From nobody Mon Feb 9 03:14:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623423045; cv=none; d=zohomail.com; s=zohoarc; b=KGqiHEX6elPruARUh82p1WwM7ApMN1X18aTHZbcu+asONkWolUZjn8TvGpSy5rBEzSTYL6Mh4/4OydVQNCVvXOcTe6xiyowzQMRlB1sFtANC6RgVw+H9AHKiLchH0MbfJiOgsSLVz8ALUucTTOecBi6F1uJ/gjZ2XMsQ0hRBiRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623423045; h=Content-Type:Content-Transfer-Encoding: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=GiYa9tL+llrO0EIXWPcH+fDjHLpjFr8Z8bN9bq3eaGY=; b=DCZ0HLIxO0vaYGrvEQxNV+vPDjbV8j2bgwIEbc/3SpSYPRS7yzjC3lEYkF4C3FA//TAVCmeh7x/EZt1+P7UPBs3pmNMZkt3sEnpAsobyUM0W7f4zCpoWILi9bHYXzVzU41yEpcefRXQbEAElBntyQAjPjvVIkg+XtqxrIFZ6u5o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623423045494806.8969880105172; Fri, 11 Jun 2021 07:50:45 -0700 (PDT) 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-485-qgCBqfVpOA2P1q9KqNLWHQ-1; Fri, 11 Jun 2021 10:50:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5AB7B1926DA3; Fri, 11 Jun 2021 14:50:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 38AFE5D9CC; Fri, 11 Jun 2021 14:50:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0313546F5A; Fri, 11 Jun 2021 14:50:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15BEnL8c007646 for ; Fri, 11 Jun 2021 10:49:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8EE0F60FC2; Fri, 11 Jun 2021 14:49:21 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id F06AC60C05 for ; Fri, 11 Jun 2021 14:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623423044; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=GiYa9tL+llrO0EIXWPcH+fDjHLpjFr8Z8bN9bq3eaGY=; b=LU741pctusRbLwtlxxVqtTb9ZNHLZQWF5pfcaq0eF6krjRNnGXMvpdOOf5dICmyW3Yr+9N 82uUVRRFHAs6ZMU8xKT6S94fYPXpNp3JSPjAtmO9ATUHbDs5MsQbqdyi7ddaW198EDDTRV SXfD72I28JkwQQOsMMcO+/AV34zFDzw= X-MC-Unique: qgCBqfVpOA2P1q9KqNLWHQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/22] tests: qemuxml2argv: Remove redundant tests for the obsolete 'virtio-390' machine Date: Fri, 11 Jun 2021 16:48:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Remove the console, disk, and network test for the legacy s390 machine which was removed in qemu 2.6. All of these have 'ccw' equivalents. Signed-off-by: Peter Krempa --- .../qemuxml2argvdata/console-virtio-s390.args | 29 ------------------- .../qemuxml2argvdata/console-virtio-s390.xml | 24 --------------- tests/qemuxml2argvdata/disk-virtio-s390.args | 26 ----------------- tests/qemuxml2argvdata/disk-virtio-s390.xml | 22 -------------- tests/qemuxml2argvdata/net-virtio-s390.args | 26 ----------------- tests/qemuxml2argvdata/net-virtio-s390.xml | 22 -------------- tests/qemuxml2argvtest.c | 6 ---- 7 files changed, 155 deletions(-) delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/console-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390.xml delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-s390.xml diff --git a/tests/qemuxml2argvdata/console-virtio-s390.args b/tests/qemuxm= l2argvdata/console-virtio-s390.args deleted file mode 100644 index 60064ced2d..0000000000 --- a/tests/qemuxml2argvdata/console-virtio-s390.args +++ /dev/null @@ -1,29 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --device virtio-serial-s390,id=3Dvirtio-serial0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,booti= ndex=3D1 \ --chardev pty,id=3Dcharconsole0 \ --device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 diff --git a/tests/qemuxml2argvdata/console-virtio-s390.xml b/tests/qemuxml= 2argvdata/console-virtio-s390.xml deleted file mode 100644 index 2150e79829..0000000000 --- a/tests/qemuxml2argvdata/console-virtio-s390.xml +++ /dev/null @@ -1,24 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - - hvm - - - destroy - restart - destroy - - /usr/bin/qemu-system-s390x - - - - - - - - - - diff --git a/tests/qemuxml2argvdata/disk-virtio-s390.args b/tests/qemuxml2a= rgvdata/disk-virtio-s390.args deleted file mode 100644 index a2ebc87f9c..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-s390.args +++ /dev/null @@ -1,26 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-s390,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,booti= ndex=3D1 diff --git a/tests/qemuxml2argvdata/disk-virtio-s390.xml b/tests/qemuxml2ar= gvdata/disk-virtio-s390.xml deleted file mode 100644 index c186f60223..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-s390.xml +++ /dev/null @@ -1,22 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-s390x - - - - - - diff --git a/tests/qemuxml2argvdata/net-virtio-s390.args b/tests/qemuxml2ar= gvdata/net-virtio-s390.args deleted file mode 100644 index e7a688081a..0000000000 --- a/tests/qemuxml2argvdata/net-virtio-s390.args +++ /dev/null @@ -1,26 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-s390x \ --name QEMUGuest1 \ --S \ --machine s390-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 214 \ --realtime mlock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --netdev user,id=3Dhostnet0 \ --device virtio-net-s390,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55 diff --git a/tests/qemuxml2argvdata/net-virtio-s390.xml b/tests/qemuxml2arg= vdata/net-virtio-s390.xml deleted file mode 100644 index 0a390bfa0e..0000000000 --- a/tests/qemuxml2argvdata/net-virtio-s390.xml +++ /dev/null @@ -1,22 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-s390x - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2da4f9f37e..daf702cab6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1336,8 +1336,6 @@ mymain(void) DO_TEST_FAILURE("disk-floppy-pseries", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("disk-floppy-tray", NONE); - DO_TEST("disk-virtio-s390", - QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-virtio", NONE); DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); @@ -1634,8 +1632,6 @@ mymain(void) QEMU_CAPS_VIRTIO_TX_ALG); DO_TEST("net-virtio-disable-offloads", NONE); DO_TEST("net-virtio-netdev", NONE); - DO_TEST("net-virtio-s390", - QEMU_CAPS_VIRTIO_S390); DO_TEST("net-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); DO_TEST("net-virtio-rxtxqueuesize", @@ -1756,8 +1752,6 @@ mymain(void) DO_TEST("console-virtio", NONE); DO_TEST("console-virtio-many", QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("console-virtio-s390", - QEMU_CAPS_VIRTIO_S390); DO_TEST("console-virtio-ccw", QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); --=20 2.31.1