From nobody Sun Feb 8 19:56:46 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=1632315779; cv=none; d=zohomail.com; s=zohoarc; b=UzJUAVk/PCzHqKYqi7utiSxrmBHrhH+yWSbcewi3Fm1x+MfcbpJmYhk4JuYpoFMgFEitdEKAYYWD56S3U7lwZI5j3KjiBHb+XNiXxWmthz1upiqsISLcuBp+S20Ew6D2hXCKqP4MTEu9Hm3aXTZ6EXHleq0qM9h9SnFRVZWh4zE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315779; 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=6uLw+9ycb6yj7fWFdP52ER9apg6nKKBMOAGHAnRheE8=; b=bnA4UzlJ9XHFCjnhlq48aQFClGKA+fEKocQIVY1X83hE7ySsoJOEcMWjq2eOF4pyCKaUxRageCLbEzsK9oFdrRiM/PI3PMx/XYJTicgN99KSwlTz8Y7OwSvO+q1LgrELYa/boiqGCU0rPvC+3gQqGis0bVFKWmIkhQzOKVAPYPA= 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 1632315779293264.593136773124; Wed, 22 Sep 2021 06:02:59 -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-601-WR9VKx1aNw2EXZR3XQTRFQ-1; Wed, 22 Sep 2021 09:02:55 -0400 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 567851922963; Wed, 22 Sep 2021 13:02:50 +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 3334E19730; Wed, 22 Sep 2021 13:02:50 +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 EE53E4EA38; Wed, 22 Sep 2021 13:02:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18MD2aaC020305 for ; Wed, 22 Sep 2021 09:02:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 817405D9DC; Wed, 22 Sep 2021 13:02:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB4CB5D9CA for ; Wed, 22 Sep 2021 13:02:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315778; 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=6uLw+9ycb6yj7fWFdP52ER9apg6nKKBMOAGHAnRheE8=; b=RUen418RmPUn3XbORlRk4sJ8SKpveQsM52Ad1qCE/iNqKHumX4A68A7EqU25xDtbePKYOq vsomsuaMo9S4cmVdhOM6K/NUY9HlFUx4CqtDSrycin5RNokeU2xuNKQeqR9Ygx3LbiwxV3 LHL8GBMJtXPL6fnY3QNz40rd8uKyPHk= X-MC-Unique: WR9VKx1aNw2EXZR3XQTRFQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/20] qemuxml2argvtest: Agregate all 'disk'-related test cases Date: Wed, 22 Sep 2021 15:02:13 +0200 Message-Id: <86c2e6693325186c898effa4e40fc77af238b200.1632315628.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.84 on 10.5.11.23 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) X-ZM-MESSAGEID: 1632315793016100005 Content-Type: text/plain; charset="utf-8" There were a few disk-related test cases spread around in the test invocation calls. Move them together with disk tests and move one irrelevant case away from the disk test block. Note that there are still a few tests having 'disk' in the name but they belong to different groups mostly. Signed-off-by: Peter Krempa --- tests/qemuxml2argvtest.c | 50 +++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cca0542b32..d0a73aee1c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1290,6 +1290,9 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-memaccess3"); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST_NOCAPS("nosharepages"); + + DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); + DO_TEST_NOCAPS("disk-cdrom"); DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); @@ -1317,7 +1320,6 @@ mymain(void) 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_CAPS_LATEST("disk-virtio-queues"); DO_TEST_NOCAPS("disk-boot-disk"); @@ -1468,6 +1470,29 @@ mymain(void) DO_TEST_CAPS_ARCH_VER("disk-arm-virtio-sd", "aarch64", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64"); + DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS); + DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS); + DO_TEST_NOCAPS("luks-disks"); + DO_TEST_NOCAPS("luks-disks-source"); + DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-qcow2"); + DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_QCOW2_LUKS); + DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0"); + DO_TEST_CAPS_LATEST("luks-disks-source-qcow2"); + DO_TEST_PARSE_ERROR_NOCAPS("luks-disk-invalid"); + DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-both"); + + DO_TEST_NOCAPS("disk-ide-split"); + DO_TEST("disk-ide-wwn", + QEMU_CAPS_IDE_DRIVE_WWN, + QEMU_CAPS_SCSI_DISK_WWN); + + DO_TEST_NOCAPS("disk-geometry"); + DO_TEST("disk-blockio", QEMU_CAPS_BLOCKIO); + + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); + DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); + DO_TEST("graphics-egl-headless", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_EGL_HEADLESS); @@ -2104,17 +2129,6 @@ mymain(void) DO_TEST_CAPS_LATEST("cpu-translation"); qemuTestSetHostCPU(&driver, driver.hostarch, NULL); - DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS); - DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS); - DO_TEST_NOCAPS("luks-disks"); - DO_TEST_NOCAPS("luks-disks-source"); - DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-qcow2"); - DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_QCOW2_LUKS); - DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0"); - DO_TEST_CAPS_LATEST("luks-disks-source-qcow2"); - DO_TEST_PARSE_ERROR_NOCAPS("luks-disk-invalid"); - DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-both"); - DO_TEST_NOCAPS("memtune"); DO_TEST_NOCAPS("memtune-unlimited"); DO_TEST_NOCAPS("blkiotune"); @@ -2433,14 +2447,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO); DO_TEST_PARSE_ERROR_NOCAPS("mach-virt-serial-invalid-machine"); - DO_TEST_NOCAPS("disk-ide-split"); - DO_TEST("disk-ide-wwn", - QEMU_CAPS_IDE_DRIVE_WWN, - QEMU_CAPS_SCSI_DISK_WWN); - - DO_TEST_NOCAPS("disk-geometry"); - DO_TEST("disk-blockio", QEMU_CAPS_BLOCKIO); - DO_TEST("video-device-pciaddr-default", QEMU_CAPS_KVM, QEMU_CAPS_VNC, @@ -3410,10 +3416,6 @@ mymain(void) QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); - DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); - DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); - DO_TEST_CAPS_LATEST("tseg-explicit-size"); DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-i440fx"); DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-invalid-size"); --=20 2.31.1