yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-block-qcow2-improve-error-message-in-qcow2_inactivat.patch

ae23c9
From 821666d219f5caefa9b94c5fedeb850983616f24 Mon Sep 17 00:00:00 2001
ae23c9
From: John Snow <jsnow@redhat.com>
ae23c9
Date: Tue, 20 Nov 2018 18:18:24 +0000
ae23c9
Subject: [PATCH 30/35] block/qcow2: improve error message in qcow2_inactivate
ae23c9
ae23c9
RH-Author: John Snow <jsnow@redhat.com>
ae23c9
Message-id: <20181120181828.15132-21-jsnow@redhat.com>
ae23c9
Patchwork-id: 83070
ae23c9
O-Subject: [RHEL8/rhel qemu-kvm PATCH 20/24] block/qcow2: improve error message in qcow2_inactivate
ae23c9
Bugzilla: 1518989
ae23c9
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
ae23c9
RH-Acked-by: Max Reitz <mreitz@redhat.com>
ae23c9
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
ae23c9
ae23c9
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
ae23c9
ae23c9
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
ae23c9
[Maintainer edit -- touched up error message. --js]
ae23c9
Reviewed-by: John Snow <jsnow@redhat.com>
ae23c9
Signed-off-by: John Snow <jsnow@redhat.com>
ae23c9
(cherry picked from commit 132adb682098e9af40a2132ec4feec6850fce8cd)
ae23c9
Signed-off-by: John Snow <jsnow@redhat.com>
ae23c9
ae23c9
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
ae23c9
---
ae23c9
 block/qcow2.c | 6 +++---
ae23c9
 1 file changed, 3 insertions(+), 3 deletions(-)
ae23c9
ae23c9
diff --git a/block/qcow2.c b/block/qcow2.c
ae23c9
index 1ea7203..5c5530d 100644
ae23c9
--- a/block/qcow2.c
ae23c9
+++ b/block/qcow2.c
ae23c9
@@ -2116,9 +2116,9 @@ static int qcow2_inactivate(BlockDriverState *bs)
ae23c9
     qcow2_store_persistent_dirty_bitmaps(bs, &local_err);
ae23c9
     if (local_err != NULL) {
ae23c9
         result = -EINVAL;
ae23c9
-        error_report_err(local_err);
ae23c9
-        error_report("Persistent bitmaps are lost for node '%s'",
ae23c9
-                     bdrv_get_device_or_node_name(bs));
ae23c9
+        error_reportf_err(local_err, "Lost persistent bitmaps during "
ae23c9
+                          "inactivation of node '%s': ",
ae23c9
+                          bdrv_get_device_or_node_name(bs));
ae23c9
     }
ae23c9
 
ae23c9
     ret = qcow2_cache_flush(bs, s->l2_table_cache);
ae23c9
-- 
ae23c9
1.8.3.1
ae23c9