From nobody Wed May 15 11:33:01 2024 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=1644848644; cv=none; d=zohomail.com; s=zohoarc; b=h7x6l1icIj6SnGzNTbBBTVC68wn9PTWGNQ+0l/zBl7y93ZGvrVOZf+v8FWWBI4hBGmU42nELq/bvhyvtwreEvRZJzRzUhMCE9zQEozpCgguUpxSvFAw9jcaAyHM74W9LFRX/I1ZvV0Kk8OoQc6KCW4wO4YDTmblKDrU9DOoV5MU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644848644; 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=KRwUWTwoxfOp4pAKnRFOcgMT5w6sSixNFmTd0QufbAs=; b=IJeHQiiztWNP3bqbm3Sd4k/8fj5DZz2jd/vxN82x0L7JBrFCkAQVqmpCqcW/cPdb0BtwCpFvdAaj3H2L1qWCDkD/tWGQi/2kGBWdK3Gu/S+b302n8deXr2cEEVjE0smkcvUT1L35zAiu8Me2vetxn5eQxqM1rOiNtyBwiVc55LM= 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 1644848644746427.41371820411064; Mon, 14 Feb 2022 06:24:04 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-496-V4e-flOZPHu0T_K-iMkm2w-1; Mon, 14 Feb 2022 09:24:01 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98BC88143F3; Mon, 14 Feb 2022 14:23:55 +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 76D8B101E7E1; Mon, 14 Feb 2022 14:23: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 1BBD74A700; Mon, 14 Feb 2022 14:23:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21EEN5OP013858 for ; Mon, 14 Feb 2022 09:23:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2EFBD101E693; Mon, 14 Feb 2022 14:23:05 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77CA9101E59D for ; Mon, 14 Feb 2022 14:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644848643; 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=KRwUWTwoxfOp4pAKnRFOcgMT5w6sSixNFmTd0QufbAs=; b=eXcYSgpJe0xUALvVYqxFPZm/xMeQBzwAo4n54NBzxWVj2Iw0Fa76zKWKXKBQozXBmOxKot 0Un5kFm979hNDTTc80R0tNfYiSYRmtIUJxXB3UUVRO5pHqkofL01nAL9e/gd0VR5MIeB7l lFbOTWZepKOtPEOxiOO5d+1VE/CbiSk= X-MC-Unique: V4e-flOZPHu0T_K-iMkm2w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/5] qemu: command: Inline qemuBuildDiskFrontendAttributeErrorPolicy Date: Mon, 14 Feb 2022 15:22:53 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.22 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: 1644848646189100001 Content-Type: text/plain; charset="utf-8" Commit dc481f11a61 which converted the function generating properties for disk '-device' argument to JSON removed the only other use of qemuBuildDiskFrontendAttributeErrorPolicy, so we can now inline it into qemuBuildDriveStr. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1abff4fcaa..2c963a7297 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2002,22 +2002,6 @@ qemuBuildDiskGetErrorPolicy(virDomainDiskDef *disk, } -static void -qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDef *disk, - virBuffer *buf) -{ - const char *wpolicy =3D NULL; - const char *rpolicy =3D NULL; - - qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); - - if (wpolicy) - virBufferAsprintf(buf, ",werror=3D%s", wpolicy); - if (rpolicy) - virBufferAsprintf(buf, ",rerror=3D%s", rpolicy); -} - - static char * qemuBuildDriveStr(virDomainDiskDef *disk, virQEMUCaps *qemuCaps) @@ -2043,8 +2027,17 @@ qemuBuildDriveStr(virDomainDiskDef *disk, /* werror/rerror are really frontend attributes, but older * qemu requires them on -drive instead of -device */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR)) - qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR)) { + const char *wpolicy =3D NULL; + const char *rpolicy =3D NULL; + + qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); + + if (wpolicy) + virBufferAsprintf(&opt, ",werror=3D%s", wpolicy); + if (rpolicy) + virBufferAsprintf(&opt, ",rerror=3D%s", rpolicy); + } if (disk->src->readonly) virBufferAddLit(&opt, ",readonly=3Don"); --=20 2.34.1 From nobody Wed May 15 11:33:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1644848647; cv=none; d=zohomail.com; s=zohoarc; b=BX4tfbK8NvStCD6nnMVGCWvi06can5aQ2kb3CUsEqGhe0geq2yWdODhNkeJKqkcXhvl+KOXQOhTwKzRdxAIvBTfm+XOVCNlLRDtShzNX6MMvlJn0URpeOVdU+aUqfdn2Unzzy+J3UzLyHWzXbKTlG5uFiHVUU8RILmlLtycEHFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644848647; 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=MfrT7lmT9rr4tFYxHeMajxhCETpHSIVSYj6Upl2FJzk=; b=WTxj9DEUmNbFVScopnpIWZUzirk2BQDQ84e383/5ht5kKhmja4k5smF8TwVzw1Yx8JmKnzqJD9D7cmCpxSVmeVlQdEkU0YyXuqabxbBWCKQOVNARRkHzRdMePJXNiJD1d4MAN49OU2RDk0YEVYxOSRLVNannEeZp2ENpkK2POmU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1644848647679960.3493599922725; Mon, 14 Feb 2022 06:24:07 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-451-f7a0ChnnMbCpstd7O8SKLA-1; Mon, 14 Feb 2022 09:24:04 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B5AA9184B7E9; Mon, 14 Feb 2022 14:23:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D0F01091ED8; Mon, 14 Feb 2022 14:23:58 +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 4284C1806D1C; Mon, 14 Feb 2022 14:23:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21EEN6wl013865 for ; Mon, 14 Feb 2022 09:23:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3C34F101E87D; Mon, 14 Feb 2022 14:23:06 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C20F101E7E1 for ; Mon, 14 Feb 2022 14:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644848646; 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=MfrT7lmT9rr4tFYxHeMajxhCETpHSIVSYj6Upl2FJzk=; b=LB1uEpfUWlJRUPZtLl4CGDlCaGIvsmLbOh/OLWIRTZGvsA6qb33QgCRTrDjWBYATT8VV68 Edm8Sm+jWxGU11Zb9ZFJqicpMMBpA3Z337Kvwot7vbmZLs+vsDTN3nI1PjwXxjm6f6oavZ V3cdT3oiPve750Ko9tYx+gPwBXGxmg4= X-MC-Unique: f7a0ChnnMbCpstd7O8SKLA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/5] qemuxml2argvtest: Add pre-blockdev post-werror-move version of 'disk-error-policy' Date: Mon, 14 Feb 2022 15:22:54 +0100 Message-Id: <041fa8c8772400b37bf341e6fa8356ad0bec6bbd.1644848300.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.22 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: 1644848648182100003 Content-Type: text/plain; charset="utf-8" Starting with qemu-3.0 release we use the 'werror' and 'rerror' properties with the frontend (device) rather than the storage backend (with a minor caveat of s390, where we use it earlier as it doesn't support USB disks, and other disk types supported it earlier). Add specific test cases after the change, but before '-blockdev' was enabled. This is done separately from the changes in the next commit which simply moves all other disk tests to the last pre-blockdev qemu as we have a semantic change happening after 2.12. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../disk-error-policy-s390x.s390x-4.0.0.args | 35 ++++++++++++++++++ .../disk-error-policy.x86_64-4.1.0.args | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 3 files changed, 74 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.= 0.0.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.a= rgs diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.arg= s b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args new file mode 100644 index 0000000000..2cda1351c4 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-s390x \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ +-machine s390-ccw-virtio-4.0,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-m 214 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-drive file=3D/var/images/image1,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk0,cache=3Dnone \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Ddrive-virtio-d= isk0,id=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,werror=3Dstop,rerror= =3Dstop \ +-drive file=3D/var/images/image2,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk1,cache=3Dnone \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0001,drive=3Ddrive-virtio-d= isk1,id=3Dvirtio-disk1,write-cache=3Don,werror=3Denospc \ +-drive file=3D/var/images/image3,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk2,cache=3Dnone \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0002,drive=3Ddrive-virtio-d= isk2,id=3Dvirtio-disk2,write-cache=3Don,werror=3Dreport,rerror=3Dignore \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args b/t= ests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args new file mode 100644 index 0000000000..f08ce16a4e --- /dev/null +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args @@ -0,0 +1,37 @@ +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-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-m 214 \ +-overcommit mem-lock=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,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,cache=3Dnone \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1,write-cache=3Don,werror=3Dstop,rerror=3Dstop \ +-drive file=3D/dev/HostVG/QEMUGuest2,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-1,cache=3Dnone \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1,w= rite-cache=3Don,werror=3Denospc \ +-drive file=3D/dev/HostVG/QEMUGuest3,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-1-0,cache=3Dnone \ +-device ide-hd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,w= rite-cache=3Don,werror=3Dreport,rerror=3Dignore \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1e1d9ee9a1..ee74eda7a8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1347,8 +1347,10 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow"); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); + DO_TEST_CAPS_VER("disk-error-policy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); + DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x"); DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cache"); --=20 2.34.1 From nobody Wed May 15 11:33:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1644848654; cv=none; d=zohomail.com; s=zohoarc; b=gwbRLflcB82LDsOYgs72HL2bMROcc1R4vd4lxWb6npQvHP4abOmtfCzNBs33y2mnGVDcs1W9YQUdMLgjYpnrJ4nXp3xySEJzw4fLVfJohTswLVM+7OEdiumTQD3hHGsFbc5qbfW2SSBGIjIfaakRe8mcRdk9ahfibgw9KS6OLtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644848654; 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=TBx3wjisD39SJkL/tbgM/lqZ17V5032Nz0RTu6gymRI=; b=WSa5C3cGcOw328sS/10r8AAjt9Ejx+413cYxxcFE5WLLRRkVBYzPTOZ4TJMCFfomOt+8H0UUB7F8SJ8WaLw215/OpZ0F0dAfhWEjtHEfS09xipqGRUryMg95RF75g6Ut0Kd0EMRzLBw63HPVgGxnYpnXu8fV9kQ6x10U1SMPI0s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1644848654437788.7996880952538; Mon, 14 Feb 2022 06:24:14 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-505-a5bOCKrrPCSWeuPQks7BFQ-1; Mon, 14 Feb 2022 09:24:07 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A59AB1091DB0; Mon, 14 Feb 2022 14:24:01 +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 4FF98753D6; Mon, 14 Feb 2022 14:24:01 +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 14E4C4A700; Mon, 14 Feb 2022 14:24:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21EEN7kA013879 for ; Mon, 14 Feb 2022 09:23:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 484BE101E7E1; Mon, 14 Feb 2022 14:23:07 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B807101E816 for ; Mon, 14 Feb 2022 14:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644848654; 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=TBx3wjisD39SJkL/tbgM/lqZ17V5032Nz0RTu6gymRI=; b=g3AqlrlWVvLfbG4clupjdRtIz494I1dwOJ4Go/zZsecTd029q1A8l7QX9rbim/rBZyiXpB sJ1xM1qTbhiiAJDn1I7jOWCIQc8p63GVDsMdRGxyEHE8QTM+ksGiIvhKQYLDiuRJVA8AbY LHKsHiUW0xT5SR+sX904b82EV+9gH2Q= X-MC-Unique: a5bOCKrrPCSWeuPQks7BFQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/5] qemuxml2argvtest: Update disk test cases having 'device_id' argument of SCSI disk Date: Mon, 14 Feb 2022 15:22:55 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.11 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: 1644848656289100001 Content-Type: text/plain; charset="utf-8" The 'device_add' property was added in qemu-4.0. Since upcoming patch will be modernizing all disk test cases we specifically want to preserve the instance of 'device_add' not being used with qemu-3.1 and earlier. Change the 'disk-cache' and 'disk-shared' cases to have a qemu-3.1 and a qemu-4.1 version for testing pre-'device_id' and pre-blockdev scenarios. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...12.0.args =3D> disk-cache.x86_64-3.1.0.args} | 4 +- .../disk-cache.x86_64-4.1.0.args | 42 +++++++++++++++++++ ...2.0.args =3D> disk-shared.x86_64-3.1.0.args} | 4 +- .../disk-shared.x86_64-4.1.0.args | 41 ++++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++- 5 files changed, 91 insertions(+), 6 deletions(-) rename tests/qemuxml2argvdata/{disk-cache.x86_64-2.12.0.args =3D> disk-cac= he.x86_64-3.1.0.args} (96%) create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-shared.x86_64-2.12.0.args =3D> disk-sh= ared.x86_64-3.1.0.args} (95%) create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-3.1.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args index 2fa865ae3a..9240080adb 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-3.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args b/tests/qe= muxml2argvdata/disk-cache.x86_64-4.1.0.args new file mode 100644 index 0000000000..f1b2d6989d --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args @@ -0,0 +1,42 @@ +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-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-m 214 \ +-overcommit mem-lock=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,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,cache=3Dwriteback \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1,write-cache=3Don \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-1,cache=3Dunsafe \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1,w= rite-cache=3Don \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-s= csi0-0-0,cache=3Dnone \ +-device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,driv= e=3Ddrive-scsi0-0-0,id=3Dscsi0-0-0,write-cache=3Don \ +-drive file=3D/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan= .hdserver:hydrar-desktop.win7vm-lun-0,format=3Dqcow2,if=3Dnone,id=3Ddrive-v= irtio-disk0,cache=3Dwritethrough \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk0,id=3Dvirtio-disk0,write-cache=3Doff \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-u= sb-disk1,cache=3Ddirectsync \ +-device usb-storage,bus=3Dusb.0,port=3D1,drive=3Ddrive-usb-disk1,id=3Dusb-= disk1,removable=3Doff,write-cache=3Doff \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-3.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args index 7989db52c0..1d5fda0215 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-3.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args b/tests/q= emuxml2argvdata/disk-shared.x86_64-4.1.0.args new file mode 100644 index 0000000000..2c2a52e6d6 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args @@ -0,0 +1,41 @@ +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-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-m 214 \ +-overcommit mem-lock=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,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0,cache=3Dnone \ +-device ide-hd,bus=3Dide.0,unit=3D0,share-rw=3Don,drive=3Ddrive-ide0-0-0,i= d=3Dide0-0-0,bootindex=3D1,write-cache=3Don,serial=3DXYZXYZXYZYXXYZYZYXYZY \ +-drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,readonly=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ +-drive file=3D/dev/scsi,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-0-0,cach= e=3Dnone \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,share-rw=3Don,drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0,= write-cache=3Don \ +-drive file=3D/dev/virtio,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0,c= ache=3Dnone \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,share-rw=3Don,dri= ve=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,write-cache=3Don \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ee74eda7a8..eee540f24f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1343,7 +1343,8 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-cow"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso"); - DO_TEST_CAPS_VER("disk-shared", "2.12.0"); + DO_TEST_CAPS_VER("disk-shared", "3.1.0"); + DO_TEST_CAPS_VER("disk-shared", "4.1.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow"); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); @@ -1352,7 +1353,8 @@ mymain(void) DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x"); - DO_TEST_CAPS_VER("disk-cache", "2.12.0"); + DO_TEST_CAPS_VER("disk-cache", "3.1.0"); + DO_TEST_CAPS_VER("disk-cache", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST_CAPS_LATEST("disk-metadata-cache"); DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0"); --=20 2.34.1 From nobody Wed May 15 11:33:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1644848628; cv=none; d=zohomail.com; s=zohoarc; b=fxCFo8BxvgSG84HbRSGoW7BqhWmSs0F62Ai73zVHK95WPL7i5i1NJPjficohJHZnphRyCDb7jjtn/nNkeqkv0wUbFXS/yyQuVn+o7EdTo4rqWLqDMWxYA8Vm0KvZYyX0h0PRc2QS1GCO6NKa9kz2GJfL5/JEqL4gAD/D4rZdT2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644848628; 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=ey+FUb2YdNNLkPReaBY0LjPL1qCCoKi6yDU2bbB4dtg=; b=NrhcDBdOgyOEuTulVgHKpK5aXsbVv3jt99N9drWbt8HkoaO00YTNJ3mjD/hmxGFSUDiQWi+KIbhy4U6GWj9W9YsL/C++8BnHBIK5LIMKyFUklfEvwYMYww2UWwhcpjyBFUqolTHBWNBIC4E0LU8ZKbKr2ydE0/b1IA/c6zWfskk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1644848628028649.0876185989787; Mon, 14 Feb 2022 06:23:48 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-341-kAK216eUOa-vms09N9S7mQ-1; Mon, 14 Feb 2022 09:23: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 EC0D61091DA8; Mon, 14 Feb 2022 14:23: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 C446B7D4A3; Mon, 14 Feb 2022 14:23: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 8AA8B4A7C9; Mon, 14 Feb 2022 14:23:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21EEN8Zh013888 for ; Mon, 14 Feb 2022 09:23:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 885EF101E7E1; Mon, 14 Feb 2022 14:23:08 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id B89C0101E819 for ; Mon, 14 Feb 2022 14:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644848627; 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=ey+FUb2YdNNLkPReaBY0LjPL1qCCoKi6yDU2bbB4dtg=; b=Ikhj64lS71AO1D3R2x65ecE6uqX7SRF0mWIktuqQ29/uL4HhfOWqlxir67zCjLSHbnHyxC qHRFA8vUyoaPWQa3Yq/yPuJhTUsGm62uuSSJZLUnOv8AhFvAhDeauMemKLEgQUmMOvVODo u3BjY/CNbkYXvE0KRxm9fVnL4Egqp8c= X-MC-Unique: kAK216eUOa-vms09N9S7mQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/5] qemuxml2argvtest: Bump versioned test variants for pre-blockdev disk tests to 4.1.0 Date: Mon, 14 Feb 2022 15:22:56 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.12 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: 1644848630422100005 Content-Type: text/plain; charset="utf-8" Originally when I started working on '-blockdev' support I added version locked variants of all the relevant disk tests locked to qemu-2.12, but blockdev was finally enabled with qemu-4.2. This patch bumps all of the test cases Upcoming patches will be removing support for qemu-2.12, but '-blockdev' is used only with qemu-4.2 and later. This patch adds variants locked to qemu-4.1 for all the disk tests that have a variant for 2.11 (with a slight exception of the 'disk-error-policy-s390x' case locked to qemu-4.0 as we don't have qemu-4.1 caps for s390x). Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...2.12.0.args =3D> disk-aio.x86_64-4.1.0.args} | 4 +- ...sk-backing-chains-index.x86_64-2.12.0.args | 1 - ...sk-backing-chains-index.x86_64-4.1.0.args} | 4 +- ...k-backing-chains-noindex.x86_64-4.1.0.args | 1 + ...s =3D> disk-cdrom-network.x86_64-4.1.0.args} | 4 +- ...args =3D> disk-cdrom-tray.x86_64-4.1.0.args} | 4 +- ...12.0.args =3D> disk-cdrom.x86_64-4.1.0.args} | 4 +- ...gs =3D> disk-copy_on_read.x86_64-4.1.0.args} | 4 +- ...s =3D> disk-detect-zeroes.x86_64-4.1.0.args} | 4 +- ...args =3D> disk-floppy-q35.x86_64-4.1.0.args} | 4 +- ...2.0.args =3D> disk-floppy.x86_64-4.1.0.args} | 4 +- ...=3D> disk-network-gluster.x86_64-4.1.0.args} | 4 +- ...s =3D> disk-network-iscsi.x86_64-4.1.0.args} | 4 +- ...rgs =3D> disk-network-nbd.x86_64-4.1.0.args} | 4 +- ...rgs =3D> disk-network-rbd.x86_64-4.1.0.args} | 4 +- ...> disk-network-sheepdog.x86_64-4.1.0.args} | 4 +- ...isk-network-source-auth.x86_64-4.1.0.args} | 4 +- ...isk-network-tlsx509-nbd.x86_64-4.1.0.args} | 4 +- ...sk-network-tlsx509-vxhs.x86_64-4.1.0.args} | 4 +- ...s =3D> disk-readonly-disk.x86_64-4.1.0.args} | 4 +- ...irtio-scsi-reservations.x86_64-4.1.0.args} | 4 +- ...rgs =3D> floppy-drive-fat.x86_64-4.1.0.args} | 4 +- tests/qemuxml2argvtest.c | 44 ++++++++++--------- 23 files changed, 64 insertions(+), 62 deletions(-) rename tests/qemuxml2argvdata/{disk-aio.x86_64-2.12.0.args =3D> disk-aio.x= 86_64-4.1.0.args} (94%) delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64= -2.12.0.args rename tests/qemuxml2argvdata/{disk-backing-chains-noindex.x86_64-2.12.0.a= rgs =3D> disk-backing-chains-index.x86_64-4.1.0.args} (96%) create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_= 64-4.1.0.args rename tests/qemuxml2argvdata/{disk-cdrom-network.x86_64-2.12.0.args =3D> = disk-cdrom-network.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom-tray.x86_64-2.12.0.args =3D> dis= k-cdrom-tray.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom.x86_64-2.12.0.args =3D> disk-cdr= om.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-copy_on_read.x86_64-2.12.0.args =3D> d= isk-copy_on_read.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-detect-zeroes.x86_64-2.12.0.args =3D> = disk-detect-zeroes.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-floppy-q35.x86_64-2.12.0.args =3D> dis= k-floppy-q35.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-floppy.x86_64-2.12.0.args =3D> disk-fl= oppy.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-gluster.x86_64-2.12.0.args =3D= > disk-network-gluster.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-iscsi.x86_64-2.12.0.args =3D> = disk-network-iscsi.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-nbd.x86_64-2.12.0.args =3D> di= sk-network-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-rbd.x86_64-2.12.0.args =3D> di= sk-network-rbd.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-sheepdog.x86_64-2.12.0.args = =3D> disk-network-sheepdog.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-source-auth.x86_64-2.12.0.args= =3D> disk-network-source-auth.x86_64-4.1.0.args} (96%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-nbd.x86_64-2.12.0.args= =3D> disk-network-tlsx509-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-vxhs.x86_64-2.12.0.arg= s =3D> disk-network-tlsx509-vxhs.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-readonly-disk.x86_64-2.12.0.args =3D> = disk-readonly-disk.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-virtio-scsi-reservations.x86_64-2.12.0= .args =3D> disk-virtio-scsi-reservations.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{floppy-drive-fat.x86_64-2.12.0.args =3D> fl= oppy-drive-fat.x86_64-4.1.0.args} (93%) diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qem= uxml2argvdata/disk-aio.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args index ff2b924345..c3b1b199c9 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0= .args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args deleted file mode 120000 index 3f4cd9040d..0000000000 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args +++ /dev/null @@ -1 +0,0 @@ -disk-backing-chains-noindex.x86_64-2.12.0.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12= .0.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.= 0.args rename to tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args index 5147cf93e6..77ffc8edb2 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.= 0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.ar= gs new file mode 120000 index 0000000000..855fb35edd --- /dev/null +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args @@ -0,0 +1 @@ +disk-backing-chains-index.x86_64-4.1.0.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args index aca93dd5ea..00030f208d 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 1024 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args index 8cfd70ac6b..bbece87022 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= /master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 1024 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/q= emuxml2argvdata/disk-cdrom.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args index d8dc6e81cd..443bbb67ae 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args b/= tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args index 0c96bf9718..db7b09ff4c 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= /master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 1024 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args index 910168b9fc..d7d78786a9 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args @@ -11,11 +11,11 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= /master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -cpu qemu64 \ -m 1024 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args b/te= sts/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args index efd76d6436..42b95c3102 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-q35-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/= qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args index 86ebe72c05..1069bfa964 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args index 9a4adc8145..7611d4cfa7 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args similarity index 97% rename from tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args index a6bb026050..409ba8ab31 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args index 65d3d566a9..5792e906c2 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/t= ests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args similarity index 97% rename from tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args index fd2c4a35d3..3483853e39 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.arg= s b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args index a2afcc6140..c054ba308f 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.= args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.a= rgs rename to tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args index ace4510c21..35d009bec6 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.a= rgs rename to tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args index 6f3b686822..ff8427b546 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0= .args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args similarity index 97% rename from tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.= args rename to tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args index 4821140b93..b92beed6b5 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b= /tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args index 0cef0675be..5fb40209d1 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.= 12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1= .0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.1= 2.0.args rename to tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0= .args index d3d0197e65..b063f81e55 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.ar= gs +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args @@ -12,10 +12,10 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ -object pr-manager-helper,id=3Dpr-helper0,path=3D/tmp/lib/domain--1-QEMUGu= est1/pr-helper0.sock \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 8,sockets=3D8,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/t= ests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args similarity index 93% rename from tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args index 2f096d7d39..aa0795010d 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index eee540f24f..04f0eb2f3f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1312,17 +1312,18 @@ mymain(void) DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); - DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); + /* qemu-4.1 was the last qemu version which we didn't use -blockdev wi= th */ + DO_TEST_CAPS_VER("disk-cdrom", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); - DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0"); + DO_TEST_CAPS_VER("disk-cdrom-network", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); - DO_TEST_CAPS_VER("disk-cdrom-tray", "2.12.0"); + DO_TEST_CAPS_VER("disk-cdrom-tray", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); - DO_TEST_CAPS_VER("disk-floppy", "2.12.0"); + DO_TEST_CAPS_VER("disk-floppy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy"); - DO_TEST_CAPS_VER("disk-floppy-q35", "2.12.0"); + DO_TEST_CAPS_VER("disk-floppy-q35", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy-q35"); DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64"); DO_TEST_CAPS_LATEST("disk-floppy-tray"); @@ -1334,9 +1335,9 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_CAPS_LATEST("disk-boot-disk"); DO_TEST_CAPS_LATEST("disk-boot-cdrom"); - DO_TEST_CAPS_VER("floppy-drive-fat", "2.12.0"); + DO_TEST_CAPS_VER("floppy-drive-fat", "4.1.0"); DO_TEST_CAPS_LATEST("floppy-drive-fat"); - DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0"); + DO_TEST_CAPS_VER("disk-readonly-disk", "4.1.0"); DO_TEST_CAPS_LATEST("disk-readonly-disk"); DO_TEST_CAPS_VER("disk-fmt-qcow", "4.1.0"); DO_TEST_CAPS_LATEST("disk-fmt-qcow"); @@ -1359,32 +1360,33 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-metadata-cache"); DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0"); DO_TEST_CAPS_LATEST("disk-transient"); - DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-nbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-nbd"); - DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-iscsi", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-in= valid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrett= ype"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both"); - DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-gluster", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-gluster"); - DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-rbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-encryption"); DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon"); - DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-sheepdog", "4.1.0"); + /* qemu-6.0 is the last qemu version supporting sheepdog */ DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); - DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-source-auth", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-nfs"); driver.config->vxhsTLS =3D 1; driver.config->nbdTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-a= 869-7acd6376d8ea"); driver.config->vxhsTLSx509secretUUID =3D g_strdup("6fd3f62d-9fe7-4a4e-= a869-7acd6376d8ea"); - DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "4.1.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0"); - DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-network-http"); @@ -1408,7 +1410,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error"); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST_CAPS_LATEST("disk-sata-device"); - DO_TEST_CAPS_VER("disk-aio", "2.12.0"); + DO_TEST_CAPS_VER("disk-aio", "4.1.0"); DO_TEST_CAPS_LATEST("disk-aio"); DO_TEST_CAPS_LATEST("disk-aio-io_uring"); DO_TEST_CAPS_VER("disk-source-pool", "4.1.0"); @@ -1416,11 +1418,11 @@ mymain(void) DO_TEST_CAPS_VER("disk-source-pool-mode", "4.1.0"); DO_TEST_CAPS_LATEST("disk-source-pool-mode"); DO_TEST_CAPS_LATEST("disk-ioeventfd"); - DO_TEST_CAPS_VER("disk-copy_on_read", "2.12.0"); + DO_TEST_CAPS_VER("disk-copy_on_read", "4.1.0"); DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST_CAPS_VER("disk-discard", "4.1.0"); DO_TEST_CAPS_LATEST("disk-discard"); - DO_TEST_CAPS_VER("disk-detect-zeroes", "2.12.0"); + DO_TEST_CAPS_VER("disk-detect-zeroes", "4.1.0"); DO_TEST_CAPS_LATEST("disk-detect-zeroes"); DO_TEST_CAPS_LATEST("disk-snapshot"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets"); @@ -1436,9 +1438,9 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-ide-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address"); - DO_TEST_CAPS_VER("disk-backing-chains-index", "2.12.0"); + DO_TEST_CAPS_VER("disk-backing-chains-index", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-index"); - DO_TEST_CAPS_VER("disk-backing-chains-noindex", "2.12.0"); + DO_TEST_CAPS_VER("disk-backing-chains-noindex", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-noindex"); DO_TEST_CAPS_LATEST("disk-slices"); @@ -1465,7 +1467,7 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-geometry"); DO_TEST_CAPS_LATEST("disk-blockio"); - DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "4.1.0"); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); --=20 2.34.1 From nobody Wed May 15 11:33:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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=1644848601; cv=none; d=zohomail.com; s=zohoarc; b=eEPqD5hwQ+h53NRoMEdArveWrcC2Fw6Rlyo2U0/dDVCr7wT/FYStcz3wwahK45YDA/5YDbShsgcI2KB3kdacpYs/JV2g/6DqIiuLcMGM8bS55hBmkTX2zxUQuFbt4/nzl36ZDWbLGilW0sA9mGcDUCAWnS7tgeBmDjmfW2GGsFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644848601; 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=8G1pKytewSnhpjo9OPTwonXf/Hj3Xp/1eNvH+QV2ntU=; b=gWNMdQDdviWB7KRnCWy3SMBV/1spX+1qGag626yCerHGpde2WOIM4ORyqZgTK4o6SR61VTxIf3ue5QRy67snta+Mt8w8NdidCKr31Pa8LI1/6IH4OAGpgnhlgWABjEnh2FpbcyzI8PG+Az3WSvmyAKqg3TCAopX4AvF5e+km/h8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1644848601896210.93797626160915; Mon, 14 Feb 2022 06:23:21 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-633-MDWULVB1Pf-Egs3gQ0kwdA-1; Mon, 14 Feb 2022 09:23:19 -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 8A6B81091DA0; Mon, 14 Feb 2022 14:23:13 +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 B62277D4AF; Mon, 14 Feb 2022 14:23:12 +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 48DE74CA93; Mon, 14 Feb 2022 14:23:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 21EEN9IS013901 for ; Mon, 14 Feb 2022 09:23:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8E725101F50E; Mon, 14 Feb 2022 14:23:09 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA8C2101E819 for ; Mon, 14 Feb 2022 14:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644848602; 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=8G1pKytewSnhpjo9OPTwonXf/Hj3Xp/1eNvH+QV2ntU=; b=BPYN3IS1anYgRCWUrLNh2RLNnAJN6s3ChcKNVnJcBcYDDno5brJzAkh7R2/Y38s/Xdyiwg 3vpTuVHT4//41VMCKZoa/WEYAvZjucU2HQC3xUBKXY/KR65PZlgnetjiu72xd+1hsLZ5fZ hJSZlqsPSnN3aAUBjlHSMJ7tDcoXs4Q= X-MC-Unique: MDWULVB1Pf-Egs3gQ0kwdA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/5] qemuxml2argvtest: Add newer variant of 'launch-security-sev-missing-platform-info' Date: Mon, 14 Feb 2022 15:22:57 +0100 Message-Id: <7022908603c113c07b5177d2e2a68099bc91d172.1644848300.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.12 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: fail (Signature date is -1 seconds in the future.) X-ZM-MESSAGEID: 1644848603867100001 Content-Type: text/plain; charset="utf-8" Upcoming patches will remove support for qemu-2.12. Since tests of 'sev' use hacked data we need to use our capability dump of qemu-6.0 as it has the required fields. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...ev-missing-platform-info.x86_64-6.0.0.args | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 38 insertions(+) create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-plat= form-info.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-in= fo.x86_64-6.0.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-p= latform-info.x86_64-6.0.0.args new file mode 100644 index 0000000000..5dfaf69063 --- /dev/null +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_= 64-6.0.0.args @@ -0,0 +1,37 @@ +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 \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,confidential-guest-= support=3Dlsec0,memory-backend=3Dpc.ram \ +-accel kvm \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=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,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-object '{"qom-type":"sev-guest","id":"lsec0","cbitpos":47,"reduced-phys-b= its":1,"policy":1,"dh-cert-file":"/tmp/lib/domain--1-QEMUGuest1/dh_cert.bas= e64","session-file":"/tmp/lib/domain--1-QEMUGuest1/session.base64"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 04f0eb2f3f..9c5c394e03 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3358,6 +3358,7 @@ mymain(void) DO_TEST_CAPS_VER("launch-security-sev", "2.12.0"); DO_TEST_CAPS_VER("launch-security-sev", "6.0.0"); DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "2.12.0"= ); + DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "6.0.0"); DO_TEST_CAPS_ARCH_LATEST_FULL("launch-security-sev-direct", "x86_64", ARG_QEMU_CAPS, --=20 2.34.1