0552c42c39
- kvm-Introduce-event-loop-base-abstract-class.patch [bz#2031024] - kvm-util-main-loop-Introduce-the-main-loop-into-QOM.patch [bz#2031024] - kvm-util-event-loop-base-Introduce-options-to-set-the-th.patch [bz#2031024] - kvm-qcow2-Improve-refcount-structure-rebuilding.patch [bz#2072379] - kvm-iotests-108-Test-new-refcount-rebuild-algorithm.patch [bz#2072379] - kvm-qcow2-Add-errp-to-rebuild_refcount_structure.patch [bz#2072379] - kvm-iotests-108-Fix-when-missing-user_allow_other.patch [bz#2072379] - kvm-virtio-net-setup-vhost_dev-and-notifiers-for-cvq-onl.patch [bz#2070804] - kvm-virtio-net-align-ctrl_vq-index-for-non-mq-guest-for-.patch [bz#2070804] - kvm-vhost-vdpa-fix-improper-cleanup-in-net_init_vhost_vd.patch [bz#2070804] - kvm-vhost-net-fix-improper-cleanup-in-vhost_net_start.patch [bz#2070804] - kvm-vhost-vdpa-backend-feature-should-set-only-once.patch [bz#2070804] - kvm-vhost-vdpa-change-name-and-polarity-for-vhost_vdpa_o.patch [bz#2070804] - kvm-virtio-net-don-t-handle-mq-request-in-userspace-hand.patch [bz#2070804] - kvm-Revert-globally-limit-the-maximum-number-of-CPUs.patch [bz#2094270] - kvm-vfio-common-remove-spurious-warning-on-vfio_listener.patch [bz#2086262] - Resolves: bz#2031024 (Add support for fixing thread pool size [QEMU]) - Resolves: bz#2072379 (Fail to rebuild the reference count tables of qcow2 image on host block devices (e.g. LVs)) - Resolves: bz#2070804 (PXE boot crash qemu when using multiqueue vDPA) - Resolves: bz#2094270 (Do not set the hard vCPU limit to the soft vCPU limit in downstream qemu-kvm anymore) - Resolves: bz#2086262 ([Win11][tpm]vfio_listener_region_del received unaligned region)
163 lines
7.4 KiB
Diff
163 lines
7.4 KiB
Diff
From 5e385a0e49a520550a83299632be175857b63f19 Mon Sep 17 00:00:00 2001
|
|
From: Hanna Reitz <hreitz@redhat.com>
|
|
Date: Tue, 5 Apr 2022 15:46:52 +0200
|
|
Subject: [PATCH 06/16] qcow2: Add errp to rebuild_refcount_structure()
|
|
|
|
RH-Author: Hanna Reitz <hreitz@redhat.com>
|
|
RH-MergeRequest: 96: qcow2: Improve refcount structure rebuilding
|
|
RH-Commit: [3/4] 937b89a7eab6ec6b18618d59bc1526976ad03290 (hreitz/qemu-kvm-c-9-s)
|
|
RH-Bugzilla: 2072379
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
|
Instead of fprint()-ing error messages in rebuild_refcount_structure()
|
|
and its rebuild_refcounts_write_refblocks() helper, pass them through an
|
|
Error object to qcow2_check_refcounts() (which will then print it).
|
|
|
|
Suggested-by: Eric Blake <eblake@redhat.com>
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
Message-Id: <20220405134652.19278-4-hreitz@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
(cherry picked from commit 0423f75351ab83b844a31349218b0eadd830e07a)
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
---
|
|
block/qcow2-refcount.c | 33 +++++++++++++++++++--------------
|
|
1 file changed, 19 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
|
|
index c5669eaa51..ed0ecfaa89 100644
|
|
--- a/block/qcow2-refcount.c
|
|
+++ b/block/qcow2-refcount.c
|
|
@@ -2465,7 +2465,8 @@ static int64_t alloc_clusters_imrt(BlockDriverState *bs,
|
|
static int rebuild_refcounts_write_refblocks(
|
|
BlockDriverState *bs, void **refcount_table, int64_t *nb_clusters,
|
|
int64_t first_cluster, int64_t end_cluster,
|
|
- uint64_t **on_disk_reftable_ptr, uint32_t *on_disk_reftable_entries_ptr
|
|
+ uint64_t **on_disk_reftable_ptr, uint32_t *on_disk_reftable_entries_ptr,
|
|
+ Error **errp
|
|
)
|
|
{
|
|
BDRVQcow2State *s = bs->opaque;
|
|
@@ -2516,8 +2517,8 @@ static int rebuild_refcounts_write_refblocks(
|
|
nb_clusters,
|
|
&first_free_cluster);
|
|
if (refblock_offset < 0) {
|
|
- fprintf(stderr, "ERROR allocating refblock: %s\n",
|
|
- strerror(-refblock_offset));
|
|
+ error_setg_errno(errp, -refblock_offset,
|
|
+ "ERROR allocating refblock");
|
|
return refblock_offset;
|
|
}
|
|
|
|
@@ -2539,6 +2540,7 @@ static int rebuild_refcounts_write_refblocks(
|
|
on_disk_reftable_entries *
|
|
REFTABLE_ENTRY_SIZE);
|
|
if (!on_disk_reftable) {
|
|
+ error_setg(errp, "ERROR allocating reftable memory");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
@@ -2562,7 +2564,7 @@ static int rebuild_refcounts_write_refblocks(
|
|
ret = qcow2_pre_write_overlap_check(bs, 0, refblock_offset,
|
|
s->cluster_size, false);
|
|
if (ret < 0) {
|
|
- fprintf(stderr, "ERROR writing refblock: %s\n", strerror(-ret));
|
|
+ error_setg_errno(errp, -ret, "ERROR writing refblock");
|
|
return ret;
|
|
}
|
|
|
|
@@ -2578,7 +2580,7 @@ static int rebuild_refcounts_write_refblocks(
|
|
ret = bdrv_pwrite(bs->file, refblock_offset, on_disk_refblock,
|
|
s->cluster_size);
|
|
if (ret < 0) {
|
|
- fprintf(stderr, "ERROR writing refblock: %s\n", strerror(-ret));
|
|
+ error_setg_errno(errp, -ret, "ERROR writing refblock");
|
|
return ret;
|
|
}
|
|
|
|
@@ -2601,7 +2603,8 @@ static int rebuild_refcounts_write_refblocks(
|
|
static int rebuild_refcount_structure(BlockDriverState *bs,
|
|
BdrvCheckResult *res,
|
|
void **refcount_table,
|
|
- int64_t *nb_clusters)
|
|
+ int64_t *nb_clusters,
|
|
+ Error **errp)
|
|
{
|
|
BDRVQcow2State *s = bs->opaque;
|
|
int64_t reftable_offset = -1;
|
|
@@ -2652,7 +2655,7 @@ static int rebuild_refcount_structure(BlockDriverState *bs,
|
|
rebuild_refcounts_write_refblocks(bs, refcount_table, nb_clusters,
|
|
0, *nb_clusters,
|
|
&on_disk_reftable,
|
|
- &on_disk_reftable_entries);
|
|
+ &on_disk_reftable_entries, errp);
|
|
if (reftable_size_changed < 0) {
|
|
res->check_errors++;
|
|
ret = reftable_size_changed;
|
|
@@ -2676,8 +2679,8 @@ static int rebuild_refcount_structure(BlockDriverState *bs,
|
|
refcount_table, nb_clusters,
|
|
&first_free_cluster);
|
|
if (reftable_offset < 0) {
|
|
- fprintf(stderr, "ERROR allocating reftable: %s\n",
|
|
- strerror(-reftable_offset));
|
|
+ error_setg_errno(errp, -reftable_offset,
|
|
+ "ERROR allocating reftable");
|
|
res->check_errors++;
|
|
ret = reftable_offset;
|
|
goto fail;
|
|
@@ -2695,7 +2698,7 @@ static int rebuild_refcount_structure(BlockDriverState *bs,
|
|
reftable_start_cluster,
|
|
reftable_end_cluster,
|
|
&on_disk_reftable,
|
|
- &on_disk_reftable_entries);
|
|
+ &on_disk_reftable_entries, errp);
|
|
if (reftable_size_changed < 0) {
|
|
res->check_errors++;
|
|
ret = reftable_size_changed;
|
|
@@ -2725,7 +2728,7 @@ static int rebuild_refcount_structure(BlockDriverState *bs,
|
|
ret = qcow2_pre_write_overlap_check(bs, 0, reftable_offset, reftable_length,
|
|
false);
|
|
if (ret < 0) {
|
|
- fprintf(stderr, "ERROR writing reftable: %s\n", strerror(-ret));
|
|
+ error_setg_errno(errp, -ret, "ERROR writing reftable");
|
|
goto fail;
|
|
}
|
|
|
|
@@ -2733,7 +2736,7 @@ static int rebuild_refcount_structure(BlockDriverState *bs,
|
|
ret = bdrv_pwrite(bs->file, reftable_offset, on_disk_reftable,
|
|
reftable_length);
|
|
if (ret < 0) {
|
|
- fprintf(stderr, "ERROR writing reftable: %s\n", strerror(-ret));
|
|
+ error_setg_errno(errp, -ret, "ERROR writing reftable");
|
|
goto fail;
|
|
}
|
|
|
|
@@ -2746,7 +2749,7 @@ static int rebuild_refcount_structure(BlockDriverState *bs,
|
|
&reftable_offset_and_clusters,
|
|
sizeof(reftable_offset_and_clusters));
|
|
if (ret < 0) {
|
|
- fprintf(stderr, "ERROR setting reftable: %s\n", strerror(-ret));
|
|
+ error_setg_errno(errp, -ret, "ERROR setting reftable");
|
|
goto fail;
|
|
}
|
|
|
|
@@ -2814,11 +2817,13 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
|
|
if (rebuild && (fix & BDRV_FIX_ERRORS)) {
|
|
BdrvCheckResult old_res = *res;
|
|
int fresh_leaks = 0;
|
|
+ Error *local_err = NULL;
|
|
|
|
fprintf(stderr, "Rebuilding refcount structure\n");
|
|
ret = rebuild_refcount_structure(bs, res, &refcount_table,
|
|
- &nb_clusters);
|
|
+ &nb_clusters, &local_err);
|
|
if (ret < 0) {
|
|
+ error_report_err(local_err);
|
|
goto fail;
|
|
}
|
|
|
|
--
|
|
2.31.1
|
|
|