From nobody Tue Nov 26 05:48:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1585733996; cv=none; d=zohomail.com; s=zohoarc; b=YxVemuCLtkxZzCN/RYCoIDrDNnTammyxoVBIc49JHY8ooK+CMI7UQzUjfKVEOpsX/h8ebrM223KSWuQH46zFlLj0GRydJXPlEEdp1ZR+hO7YosriOrEgHLwzMNa2orrvrTBSc4iSv4taCeu/dO5d6A6sQYNdKEGTBzMyabqYqeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585733996; 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=mMgeR7hdJOk/Oke9+Jx+uAK3cLj9ZCtZk2+b//KDyv8=; b=VNe2PygQL/M5+o7raC1U1SxqaeNhv7HVbKyjequJqdlxN0bktytxq1ItRBuMGqV6SRRmHav5j6+X7/1Q867d49Zc/m8ByHr1YQ2c5RqF0kook6lZMa1/LeBfQNsAiFI+3NPwbog1FjT2ykcqk/IeR9Xz0immGpb8FmmowGnDGjE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1585733996378631.2436702799753; Wed, 1 Apr 2020 02:39:56 -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-199-y3pjQu1QOg6fXMF0Jy_yTA-1; Wed, 01 Apr 2020 05:39:53 -0400 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 B0712107ACC7; Wed, 1 Apr 2020 09:39:47 +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 5E88460C05; Wed, 1 Apr 2020 09:39:47 +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 4F5F51832DA9; Wed, 1 Apr 2020 09:39:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0319ZOZQ019726 for ; Wed, 1 Apr 2020 05:35:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id DAD5DDA107; Wed, 1 Apr 2020 09:35:24 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id 547B7DA106 for ; Wed, 1 Apr 2020 09:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585733995; 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=mMgeR7hdJOk/Oke9+Jx+uAK3cLj9ZCtZk2+b//KDyv8=; b=I3kL93qwn1Vk+an16WxIVsW5prb+MEm0FcACvHEeXAQt10mv57h27P+Ozis3ifyW5n3TQY KHqkaHAZCy8+b80o8n/5o2oxJwVcJ7UbShfLpaobdSkIzWS8Jw+EYQyif3RmuCS/afDmC3 huLvL872lJebSqqDTFld2xeR0CdTNn8= X-MC-Unique: y3pjQu1QOg6fXMF0Jy_yTA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] tests: qemu: add disk-error-policy tests for s390x Date: Wed, 1 Apr 2020 11:35:17 +0200 Message-Id: <1fa9a8762a4b3fd8ec3fec03d232047f2a595cbf.1585733685.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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" To demonstrate the move of these attributes from -drive to -device. Signed-off-by: J=C3=A1n Tomko --- .../disk-error-policy-s390x.s390x-2.12.0.args | 42 ++++++++++++++++++ .../disk-error-policy-s390x.s390x-latest.args | 43 +++++++++++++++++++ .../disk-error-policy-s390x.xml | 37 ++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 4 files changed, 124 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.= 12.0.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-la= test.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.xml diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.ar= gs b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args new file mode 100644 index 0000000000..cf932d1fad --- /dev/null +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args @@ -0,0 +1,42 @@ +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-guest/master-key.aes \ +-machine s390-ccw-virtio-2.12,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 214 \ +-realtime mlock=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,nowait \ +-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,\ +werror=3Dstop,rerror=3Dstop,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 \ +-drive file=3D/var/images/image2,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk1,\ +werror=3Denospc,cache=3Dnone \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0001,drive=3Ddrive-virtio-d= isk1,\ +id=3Dvirtio-disk1,write-cache=3Don \ +-drive file=3D/var/images/image3,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk2,\ +werror=3Dreport,rerror=3Dignore,cache=3Dnone \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0002,drive=3Ddrive-virtio-d= isk2,\ +id=3Dvirtio-disk2,write-cache=3Don \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.ar= gs b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args new file mode 100644 index 0000000000..7daddc1d87 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -0,0 +1,43 @@ +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-guest/master-key.aes \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-cpu qemu \ +-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,nowait \ +-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,\ +werror=3Dstop,rerror=3Dstop,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 \ +-drive file=3D/var/images/image2,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk1,\ +werror=3Denospc,cache=3Dnone \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0001,drive=3Ddrive-virtio-d= isk1,\ +id=3Dvirtio-disk1,write-cache=3Don \ +-drive file=3D/var/images/image3,format=3Dqcow2,if=3Dnone,id=3Ddrive-virti= o-disk2,\ +werror=3Dreport,rerror=3Dignore,cache=3Dnone \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0002,drive=3Ddrive-virtio-d= isk2,\ +id=3Dvirtio-disk2,write-cache=3Don \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.xml b/tests/qem= uxml2argvdata/disk-error-policy-s390x.xml new file mode 100644 index 0000000000..7149e66d70 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.xml @@ -0,0 +1,37 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-s390x + + + + +
+ + + + + +
+ + + + + +
+ + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4d44286b5a..596dd7a8ac 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1054,6 +1054,8 @@ mymain(void) DO_TEST("disk-error-policy", NONE); DO_TEST_CAPS_VER("disk-error-policy", "2.12.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_LATEST("disk-error-policy-s390x", "s390x"); DO_TEST_CAPS_VER("disk-cache", "1.5.3"); DO_TEST_CAPS_VER("disk-cache", "2.6.0"); DO_TEST_CAPS_VER("disk-cache", "2.7.0"); --=20 2.25.1