From nobody Fri May 17 23:53:26 2024 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=1607361244; cv=none; d=zohomail.com; s=zohoarc; b=J8KvyA2oyexcPirAoCSCqn3Gb+zEObZ3ZS1bTSkGeQ5sh8eOdMDvktuhid6khdp961z42Nbs228U34GfPoucCZzsnUUkMTBUrl5BYMAbgcdoxc3COdXuxtTxfB/uHOfUi/b2cheZdEqk9GsEzUTU/KCyi/SCxDjfLKRgi9Rmg4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607361244; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=K3ASUE1+TioBEfG0MiQbG62ts4evzLUR6PAx0DM9XTw=; b=V82rDsqB+6vGxM+6Ue2egYbN9aJ4MtwIh00q/NdC+d2ytBjSMB8kZuEFBpUgXi50CRqmwOW3Y/bQV6O5pMcu6bl2YqOe9dnAfY5u+L1SUp2s3E2cp+Ez0gpEzWFry1VwaPpE8Re+H1QH0nrj9T+CV9E6s4N3lHNYs5w6S3FcsCk= 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) header.from= 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 160736124492412.071871162319326; Mon, 7 Dec 2020 09:14:04 -0800 (PST) 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-7-BOGoMAowPAW_pJDxqJTDyg-1; Mon, 07 Dec 2020 12:09:52 -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 F39F41934104; Mon, 7 Dec 2020 17:09:45 +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 CCA8560C13; Mon, 7 Dec 2020 17:09:45 +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 91DBB180954D; Mon, 7 Dec 2020 17:09:45 +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 0B7H83xD001286 for ; Mon, 7 Dec 2020 12:08:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 25EDC5D9D0; Mon, 7 Dec 2020 17:08:03 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 617EB5D9DE for ; Mon, 7 Dec 2020 17:07:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607360995; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=K3ASUE1+TioBEfG0MiQbG62ts4evzLUR6PAx0DM9XTw=; b=PARXUWlNZv4J/rv17BdIQCKPE+OuLr0PKK4x5zNxP8reBC4856OpNnOmgz6rXKL3mjroum ii4albiGoxZiM9izAPyAzFSespvT2WrfJOcPoOQ70oFe2ns5HnN6gtWsLtoT9Dp3Y5i6ur ZRf2Sl9jDY0O/xJ+vQbB0VlM3CE+4bE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607361241; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=K3ASUE1+TioBEfG0MiQbG62ts4evzLUR6PAx0DM9XTw=; b=iEuNrsrrmw+hR4ZP4DeKrZMjt+M/kiMutiL6kT0SCR7SPvmrL+uJilCzm1paE3x2pgDrdI Qescx2U24E+UezgFimj9XsQfG2Ocl1kZAxyzwnZIhedcBFRbf2vs4XTvwjyw3HmVjz4IdZ tBrST5dp9SoHAgNVDWY8oIk2C52qu3g= X-MC-Unique: BOGoMAowPAW_pJDxqJTDyg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] qemuxml2argvtest: Add 'nvme' disks into the 'disk-slices' case Date: Mon, 7 Dec 2020 18:07:57 +0100 Message-Id: <9be7ecd6b4cd476b2fd3a2a0109af42ec98aaf15.1607360877.git.pkrempa@redhat.com> 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.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) (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Test slices on top of nvme-backed disks. Note that the changes in seemingly irrelevant parts of the output are due to re-naming the nodenames. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../disk-slices.x86_64-latest.args | 63 ++++++++++++------- tests/qemuxml2argvdata/disk-slices.xml | 25 ++++++++ .../disk-slices.x86_64-latest.xml | 25 ++++++++ 3 files changed, 92 insertions(+), 21 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-slices.x86_64-latest.args index c4e1384f4d..a24b3395e2 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -30,37 +30,58 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img",\ -"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ",\ -"offset":1234,"size":321,"file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-4-format,\ +"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ",\ +"offset":1234,"size":321,"file":"libvirt-6-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-6-format,\ id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img",\ -"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"driver":"raw","node-name":"libvirt-3-slice-sto","offset":9876= ,\ -"size":123456789,"file":"libvirt-3-storage","auto-read-only":true,\ +"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"raw","node-name":"libvirt-5-slice-sto","offset":9876= ,\ +"size":123456789,"file":"libvirt-5-storage","auto-read-only":true,\ "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"qcow= 2",\ -"file":"libvirt-3-slice-sto","backing":null}' \ +-blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"qcow= 2",\ +"file":"libvirt-5-slice-sto","backing":null}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/overlay.qc= ow2",\ -"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2",\ -"file":"libvirt-2-storage","backing":"libvirt-3-format"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,\ +"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qco= w2",\ +"file":"libvirt-4-storage","backing":"libvirt-5-format"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-4-format,\ id=3Dvirtio-disk1 \ --object secret,id=3Dlibvirt-1-format-encryption-secret0,\ +-object secret,id=3Dlibvirt-3-format-encryption-secret0,\ data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/luks.img",\ -"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"driver":"raw","node-name":"libvirt-1-slice-sto","offset":1234= ,\ -"size":321,"file":"libvirt-1-storage","auto-read-only":true,\ +"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"raw","node-name":"libvirt-3-slice-sto","offset":1234= ,\ +"size":321,"file":"libvirt-3-storage","auto-read-only":true,\ "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"luk= s",\ -"key-secret":"libvirt-1-format-encryption-secret0",\ -"file":"libvirt-1-slice-sto"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,\ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"luk= s",\ +"key-secret":"libvirt-3-format-encryption-secret0",\ +"file":"libvirt-3-slice-sto"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,\ id=3Dvirtio-disk2 \ +-blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,\ +"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ",\ +"offset":1234,"size":321,"file":"libvirt-2-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,\ +id=3Dvirtio-disk3 \ +-object secret,id=3Dlibvirt-1-format-encryption-secret0,\ +data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoLDA0ODw=3D=3D,format=3Dbase64 \ +-blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,\ +"node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"raw","node-name":"libvirt-1-slice-sto","offset":1234= ,\ +"size":321,"file":"libvirt-1-storage","auto-read-only":true,"discard":"unm= ap",\ +"cache":{"direct":true,"no-flush":false}}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ +"encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secre= t0"},\ +"file":"libvirt-1-slice-sto"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,\ +id=3Dvirtio-disk4,write-cache=3Don \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/disk-slices.xml b/tests/qemuxml2argvdat= a/disk-slices.xml index 5c6f29d154..1675766a46 100644 --- a/tests/qemuxml2argvdata/disk-slices.xml +++ b/tests/qemuxml2argvdata/disk-slices.xml @@ -51,6 +51,31 @@ + + + +
+ + + + + +
+ + + + +
+ + + + + + + + +
+ diff --git a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml b/tests= /qemuxml2xmloutdata/disk-slices.x86_64-latest.xml index 4f4abcda1f..a02820a104 100644 --- a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml @@ -57,6 +57,31 @@
+ + + +
+ + + + + +
+ + + + +
+ + + + + + + + +
+
--=20 2.28.0