1bf6609652
- migration: Skip only empty block devicesi - iotests: adapt to output change for recently introduced 'detached hea… - travis-ci: Rename SOFTMMU -> SYSTEM - block: disallow block jobs when there is a BDRV_O_INACTIVE flag - [backup] memory: bakcup hugepages: hugepages files maybe leftover - memory: [backup] Modify the VM's physical bits value set policy. - ui/clipboard: mark type as not available when there is no data (CVE-2023-6683) - virtio-net: correctly copy vnet header when flushing TX (CVE-2023-6693) Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 7212ca27f0dc957f83fe29858430ee2927e0175c Mon Sep 17 00:00:00 2001
|
|
From: root <root@localhost.localdomain>
|
|
Date: Mon, 25 Mar 2024 21:31:32 +0800
|
|
Subject: [PATCH] =?UTF-8?q?iotests:=20adapt=20to=20output=20change=20for?=
|
|
=?UTF-8?q?=20recently=20introduced=20'detached=20hea=E2=80=A6?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from 39a94d7c34ce9d222fa9c0c99a14e20a567456d7
|
|
|
|
…der' field
|
|
|
|
Failure was noticed when running the tests for the qcow2 image format.
|
|
|
|
Fixes: 0bd779e ("crypto: Introduce 'detached-header' field in QCryptoBlockInfoLUKS")
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
Message-ID: <20240216101415.293769-1-f.ebner@proxmox.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Gao Jiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
|
---
|
|
tests/qemu-iotests/198.out | 2 ++
|
|
tests/qemu-iotests/206.out | 1 +
|
|
2 files changed, 3 insertions(+)
|
|
|
|
diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
|
|
index 805494916f..62fb73fa3e 100644
|
|
--- a/tests/qemu-iotests/198.out
|
|
+++ b/tests/qemu-iotests/198.out
|
|
@@ -39,6 +39,7 @@ Format specific information:
|
|
compression type: COMPRESSION_TYPE
|
|
encrypt:
|
|
ivgen alg: plain64
|
|
+ detached header: false
|
|
hash alg: sha256
|
|
cipher alg: aes-256
|
|
uuid: 00000000-0000-0000-0000-000000000000
|
|
@@ -84,6 +85,7 @@ Format specific information:
|
|
compression type: COMPRESSION_TYPE
|
|
encrypt:
|
|
ivgen alg: plain64
|
|
+ detached header: false
|
|
hash alg: sha256
|
|
cipher alg: aes-256
|
|
uuid: 00000000-0000-0000-0000-000000000000
|
|
diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out
|
|
index 7e95694777..979f00f9bf 100644
|
|
--- a/tests/qemu-iotests/206.out
|
|
+++ b/tests/qemu-iotests/206.out
|
|
@@ -114,6 +114,7 @@ Format specific information:
|
|
refcount bits: 16
|
|
encrypt:
|
|
ivgen alg: plain64
|
|
+ detached header: false
|
|
hash alg: sha1
|
|
cipher alg: aes-128
|
|
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
|
--
|
|
2.27.0
|
|
|