|
 |
383d26 |
From 4f02070b0278bfaebe0f9af1fcb5f2624693f57c Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Date: Mon, 6 May 2019 17:56:28 +0200
|
|
|
383d26 |
Subject: [PATCH 18/53] nbd/client: Fix error message for server with unusable
|
|
|
383d26 |
sizing
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Message-id: <20190506175629.11079-19-jsnow@redhat.com>
|
|
|
383d26 |
Patchwork-id: 87188
|
|
|
383d26 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 18/19] nbd/client: Fix error message for server with unusable sizing
|
|
|
383d26 |
Bugzilla: 1692018
|
|
|
383d26 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
From: Eric Blake <eblake@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
Add a missing space to the error message used when giving up on a
|
|
|
383d26 |
server that insists on an alignment which renders the last few bytes
|
|
|
383d26 |
of the export unreadable.
|
|
|
383d26 |
|
|
|
383d26 |
Fixes: 3add3ab78
|
|
|
383d26 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
383d26 |
Message-Id: <20190404145226.32649-1-eblake@redhat.com>
|
|
|
383d26 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
383d26 |
(cherry picked from commit e53f88df77e70350b0eda92a2e5e39f67792008f)
|
|
|
383d26 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
nbd/client.c | 2 +-
|
|
|
383d26 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/nbd/client.c b/nbd/client.c
|
|
|
383d26 |
index 4309569..49754120 100644
|
|
|
383d26 |
--- a/nbd/client.c
|
|
|
383d26 |
+++ b/nbd/client.c
|
|
|
383d26 |
@@ -428,7 +428,7 @@ static int nbd_opt_info_or_go(QIOChannel *ioc, uint32_t opt,
|
|
|
383d26 |
}
|
|
|
383d26 |
if (info->min_block &&
|
|
|
383d26 |
!QEMU_IS_ALIGNED(info->size, info->min_block)) {
|
|
|
383d26 |
- error_setg(errp, "export size %" PRIu64 "is not multiple of "
|
|
|
383d26 |
+ error_setg(errp, "export size %" PRIu64 " is not multiple of "
|
|
|
383d26 |
"minimum block size %" PRIu32, info->size,
|
|
|
383d26 |
info->min_block);
|
|
|
383d26 |
nbd_send_opt_abort(ioc);
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|