yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-backup-Improve-error-for-bdrv_getlength-failure.patch

902636
From fba183faf8ce819262a1a47f8531ea68051cdce7 Mon Sep 17 00:00:00 2001
902636
From: Kevin Wolf <kwolf@redhat.com>
902636
Date: Wed, 3 Jun 2020 16:03:19 +0100
902636
Subject: [PATCH 20/26] backup: Improve error for bdrv_getlength() failure
902636
902636
RH-Author: Kevin Wolf <kwolf@redhat.com>
902636
Message-id: <20200603160325.67506-6-kwolf@redhat.com>
902636
Patchwork-id: 97103
902636
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH v2 05/11] backup: Improve error for bdrv_getlength() failure
902636
Bugzilla: 1778593
902636
RH-Acked-by: Eric Blake <eblake@redhat.com>
902636
RH-Acked-by: Max Reitz <mreitz@redhat.com>
902636
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
902636
902636
bdrv_get_device_name() will be an empty string with modern management
902636
tools that don't use -drive. Use bdrv_get_device_or_node_name() instead
902636
so that the node name is used if the BlockBackend is anonymous.
902636
902636
While at it, start with upper case to make the message consistent with
902636
the rest of the function.
902636
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
902636
Reviewed-by: Alberto Garcia <berto@igalia.com>
902636
Message-Id: <20200430142755.315494-3-kwolf@redhat.com>
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
(cherry picked from commit 58226634c4b02af7b10862f7fbd3610a344bfb7f)
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 block/backup.c | 4 ++--
902636
 1 file changed, 2 insertions(+), 2 deletions(-)
902636
902636
diff --git a/block/backup.c b/block/backup.c
902636
index ec50946..7c6ddd2 100644
902636
--- a/block/backup.c
902636
+++ b/block/backup.c
902636
@@ -408,8 +408,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
902636
 
902636
     len = bdrv_getlength(bs);
902636
     if (len < 0) {
902636
-        error_setg_errno(errp, -len, "unable to get length for '%s'",
902636
-                         bdrv_get_device_name(bs));
902636
+        error_setg_errno(errp, -len, "Unable to get length for '%s'",
902636
+                         bdrv_get_device_or_node_name(bs));
902636
         goto error;
902636
     }
902636
 
902636
-- 
902636
1.8.3.1
902636