From nobody Mon Feb 9 06:49:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1623423063; cv=none; d=zohomail.com; s=zohoarc; b=koAqrWtgyybzPhi6OvGBxVEhhfIeIKtWVlXoqqw77/ZNtx/K7LiIMzFoyEaG0IMjI9tb1rzyjppg+F3J1aLuHxWUqGyRNTT+3HUf/NpHU9VHZaYh/2JsJu8sdlPGTRJzTJPHs9rF1BIb4ijIWeM23vE3GHp2HH79UnSBo1Wp9uo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623423063; 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=/U6HDXRElyprpsJNJqz4iXY1TTl6d5D990ddcE9Zd2w=; b=BUPHqPYWnU3CoybxpIiBRwcMAqQ41vgR5CAeXbIu5v+Zv6ED2TqpIE7SO9dIVR+KGEEePd6JxzgTulbsQFjN6iUn6akY32ox4axD/fAP/tWe8g05zXFK3/6Bv3l1BENNjLfZOe+1wuavzJEXTy61YN7V2+NHAtraFSvWcoPSx4E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623423063814320.20150927130715; Fri, 11 Jun 2021 07:51:03 -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-494-WvJdsVS6M3eqY4o6SNBBYw-1; Fri, 11 Jun 2021 10:51:00 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B360801B15; Fri, 11 Jun 2021 14:50:56 +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 EA6D85C232; Fri, 11 Jun 2021 14:50:55 +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 B6EA746F62; Fri, 11 Jun 2021 14:50:55 +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 15BEnZYP007766 for ; Fri, 11 Jun 2021 10:49:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id DF1DE70584; Fri, 11 Jun 2021 14:49:34 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 459E360FC2 for ; Fri, 11 Jun 2021 14:49:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623423062; 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=/U6HDXRElyprpsJNJqz4iXY1TTl6d5D990ddcE9Zd2w=; b=JppzmKUsIQnZuif+kuU+ypxSUNECv6A3Wd7y59M5IazKHf3YtSMmBtjMTEGO/JF4c/xhk7 65iDRpFT9MNNc7sv+DQFkhVZtpBDyXu3sDKsNoqsgKJyLUKaCyl9f+vyv72BZR8VTrD9NF sWr+hQjWi2Kdfwwvm9zfL6eXf6lorBQ= X-MC-Unique: WvJdsVS6M3eqY4o6SNBBYw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/22] qemuxml2*test: Remove QEMU_CAPS_VIRTIO_S390 flag Date: Fri, 11 Jun 2021 16:49:08 +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.16 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" The flag isn't used by the code in any way so it can be dropped from the legacy test cases. Signed-off-by: Peter Krempa --- tests/qemuxml2argvtest.c | 92 ++++++++++++++-------------------------- tests/qemuxml2xmltest.c | 24 ++++------- 2 files changed, 41 insertions(+), 75 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 119bd94418..1345c42b72 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1337,14 +1337,9 @@ mymain(void) QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("disk-floppy-tray", NONE); DO_TEST("disk-virtio", NONE); - DO_TEST("disk-virtio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("disk-virtio-ccw-many", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("disk-virtio-s390-zpci", - QEMU_CAPS_DEVICE_ZPCI, - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); + DO_TEST("disk-virtio-ccw", QEMU_CAPS_CCW); + DO_TEST("disk-virtio-ccw-many", QEMU_CAPS_CCW); + DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI); DO_TEST("disk-virtio-queues", @@ -1631,8 +1626,7 @@ mymain(void) QEMU_CAPS_VIRTIO_TX_ALG); DO_TEST("net-virtio-disable-offloads", NONE); DO_TEST("net-virtio-netdev", NONE); - DO_TEST("net-virtio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("net-virtio-ccw", QEMU_CAPS_CCW); DO_TEST("net-virtio-rxtxqueuesize", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); @@ -1751,9 +1745,7 @@ mymain(void) DO_TEST("console-virtio", NONE); DO_TEST("console-virtio-many", QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("console-virtio-ccw", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); + DO_TEST("console-virtio-ccw", QEMU_CAPS_CCW); DO_TEST_CAPS_LATEST("console-virtio-unix"); DO_TEST_CAPS_ARCH_LATEST("console-sclp", "s390x"); DO_TEST("channel-spicevmc", @@ -1917,8 +1909,7 @@ mymain(void) QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("fs9p", NONE); DO_TEST_CAPS_LATEST("fs9p"); - DO_TEST("fs9p-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("fs9p-ccw", QEMU_CAPS_CCW); DO_TEST_CAPS_ARCH_LATEST("fs9p-ccw", "s390x"); DO_TEST("hostdev-usb-address", NONE); @@ -2051,7 +2042,7 @@ mymain(void) DO_TEST_FAILURE("iothreads-nocap", NONE); DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD); DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_CAPS_VER("iothreads-virtio-scsi-pci", "5.2.0"); DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x"); @@ -2089,7 +2080,7 @@ mymain(void) DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); qemuTestSetHostArch(&driver, VIR_ARCH_S390X); - DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM, QEMU_CAPS_CCW, QEMU_CAPS_VIRT= IO_S390); + DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM, QEMU_CAPS_CCW); DO_TEST("cpu-s390-features", QEMU_CAPS_KVM, QEMU_CAPS_QUERY_CPU_MODEL_= EXPANSION); DO_TEST_FAILURE("cpu-s390-features", QEMU_CAPS_KVM); qemuTestSetHostArch(&driver, VIR_ARCH_NONE); @@ -2535,37 +2526,23 @@ mymain(void) QEMU_CAPS_OBJECT_RNG_EGD); DO_TEST("virtio-rng-ccw", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x"); - DO_TEST("s390-panic-no-address", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); - DO_TEST_PARSE_ERROR("s390-panic-address", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-panic-missing", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); - DO_TEST_PARSE_ERROR("s390-no-parallel", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-serial", - QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, - QEMU_CAPS_DEVICE_SCLPCONSOLE); + DO_TEST("s390-panic-no-address", QEMU_CAPS_CCW); + DO_TEST_PARSE_ERROR("s390-panic-address", QEMU_CAPS_CCW); + DO_TEST("s390-panic-missing", QEMU_CAPS_CCW); + DO_TEST_PARSE_ERROR("s390-no-parallel", QEMU_CAPS_CCW); + DO_TEST("s390-serial", QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("s390-serial-2", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_SCLPCONSOLE, QEMU_CAPS_DEVICE_SCLPLMCONSOLE); DO_TEST("s390-serial-console", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("ppc-dtb", @@ -3146,92 +3123,89 @@ mymain(void) QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-aeskeywrap-on-caps", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-aeskeywrap-on-cap", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-aeskeywrap-on-cap", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-aeskeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-aeskeywrap-off-caps", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-aeskeywrap-off-cap", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-aeskeywrap-off-cap", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-on-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-deakeywrap-on-caps", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-on-cap", QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-deakeywrap-on-cap", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-deakeywrap-off-caps", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-deakeywrap-off-cap", QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST_FAILURE("machine-deakeywrap-off-cap", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-keywrap-none-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-keywrap-none", QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_CCW); DO_TEST("machine-loadparm-s390", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390, + QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST("machine-loadparm-net-s390", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390, + QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST("machine-loadparm-multiple-disks-nets-s390", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_LOADPARM); DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_LOADPARM); DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid", QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_LOADPARM); DO_TEST("qemu-ns-domain-ns0", NONE); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 664cfbd3ba..fc599e132b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -565,13 +565,11 @@ mymain(void) DO_TEST("iothreads-ids-partial", NONE); DO_TEST("cputune-iothreads", NONE); DO_TEST("iothreads-disk", NONE); - DO_TEST("iothreads-disk-virtio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_CCW); DO_TEST("iothreads-virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("iothreads-virtio-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW, - QEMU_CAPS_VIRTIO_S390); + QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); DO_TEST("lease", NONE); DO_TEST("event_idx", NONE); DO_TEST("vhost_queues", NONE); @@ -1052,18 +1050,12 @@ mymain(void) QEMU_CAPS_DEVICE_VFIO_AP); DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x"); - DO_TEST("s390-panic", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-panic-missing", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-panic-no-address", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-serial", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-serial-2", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("s390-serial-console", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390); + DO_TEST("s390-panic", QEMU_CAPS_CCW); + DO_TEST("s390-panic-missing", QEMU_CAPS_CCW); + DO_TEST("s390-panic-no-address", QEMU_CAPS_CCW); + DO_TEST("s390-serial", QEMU_CAPS_CCW); + DO_TEST("s390-serial-2", QEMU_CAPS_CCW); + DO_TEST("s390-serial-console", QEMU_CAPS_CCW); DO_TEST("pcihole64", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE); DO_TEST("pcihole64-gib", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE); --=20 2.31.1