114 lines
3.6 KiB
Diff
114 lines
3.6 KiB
Diff
From dcce446158c042fd0aa54a6ebcc61c00f8d4759e Mon Sep 17 00:00:00 2001
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Mon, 4 Mar 2019 08:54:27 +0000
|
|
Subject: [PATCH 4/9] iotests: add LUKS payload overhead to 178 qemu-img
|
|
measure test
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Message-id: <20190304085427.8148-3-stefanha@redhat.com>
|
|
Patchwork-id: 84777
|
|
O-Subject: [RHEL-8.0/AV qemu-kvm PATCH 2/2] iotests: add LUKS payload overhead to 178 qemu-img measure test
|
|
Bugzilla: 1655065
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
|
The previous patch includes the LUKS payload overhead into the qemu-img
|
|
measure calculation for qcow2. Update qemu-iotests 178 to exercise this
|
|
new code path.
|
|
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Message-id: 20190218104525.23674-3-stefanha@redhat.com
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
(cherry picked from commit 0482098608b83b559bc1802e4c612051b51f6c4c)
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
tests/qemu-iotests/178 | 8 ++++++++
|
|
tests/qemu-iotests/178.out.qcow2 | 24 ++++++++++++++++++++++++
|
|
2 files changed, 32 insertions(+)
|
|
|
|
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
|
|
index 3f4b4a4..927bf06 100755
|
|
--- a/tests/qemu-iotests/178
|
|
+++ b/tests/qemu-iotests/178
|
|
@@ -142,6 +142,14 @@ for ofmt in human json; do
|
|
# The backing file doesn't need to exist :)
|
|
$QEMU_IMG measure --output=$ofmt -o backing_file=x \
|
|
-f "$fmt" -O "$IMGFMT" "$TEST_IMG"
|
|
+
|
|
+ echo
|
|
+ echo "== $fmt input image and LUKS encryption =="
|
|
+ echo
|
|
+ $QEMU_IMG measure --output=$ofmt \
|
|
+ --object secret,id=sec0,data=base \
|
|
+ -o encrypt.format=luks,encrypt.key-secret=sec0,encrypt.iter-time=10 \
|
|
+ -f "$fmt" -O "$IMGFMT" "$TEST_IMG"
|
|
fi
|
|
|
|
echo
|
|
diff --git a/tests/qemu-iotests/178.out.qcow2 b/tests/qemu-iotests/178.out.qcow2
|
|
index d42d4a4..55a8dc9 100644
|
|
--- a/tests/qemu-iotests/178.out.qcow2
|
|
+++ b/tests/qemu-iotests/178.out.qcow2
|
|
@@ -68,6 +68,11 @@ converted image file size in bytes: 458752
|
|
required size: 1074135040
|
|
fully allocated size: 1074135040
|
|
|
|
+== qcow2 input image and LUKS encryption ==
|
|
+
|
|
+required size: 2686976
|
|
+fully allocated size: 1076232192
|
|
+
|
|
== qcow2 input image and preallocation (human) ==
|
|
|
|
required size: 1074135040
|
|
@@ -114,6 +119,11 @@ converted image file size in bytes: 524288
|
|
required size: 1074135040
|
|
fully allocated size: 1074135040
|
|
|
|
+== raw input image and LUKS encryption ==
|
|
+
|
|
+required size: 2686976
|
|
+fully allocated size: 1076232192
|
|
+
|
|
== raw input image and preallocation (human) ==
|
|
|
|
required size: 1074135040
|
|
@@ -205,6 +215,13 @@ converted image file size in bytes: 458752
|
|
"fully-allocated": 1074135040
|
|
}
|
|
|
|
+== qcow2 input image and LUKS encryption ==
|
|
+
|
|
+{
|
|
+ "required": 2686976,
|
|
+ "fully-allocated": 1076232192
|
|
+}
|
|
+
|
|
== qcow2 input image and preallocation (json) ==
|
|
|
|
{
|
|
@@ -263,6 +280,13 @@ converted image file size in bytes: 524288
|
|
"fully-allocated": 1074135040
|
|
}
|
|
|
|
+== raw input image and LUKS encryption ==
|
|
+
|
|
+{
|
|
+ "required": 2686976,
|
|
+ "fully-allocated": 1076232192
|
|
+}
|
|
+
|
|
== raw input image and preallocation (json) ==
|
|
|
|
{
|
|
--
|
|
1.8.3.1
|
|
|