[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/12] backup: allow target without .bdrv_get_info
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 01/12] backup: allow target without .bdrv_get_info |
Date: |
Mon, 13 Mar 2017 15:54:57 +0100 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Currently backup to nbd target is broken, as nbd doesn't have
.bdrv_get_info realization.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/backup.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/block/backup.c b/block/backup.c
index d1ab617..d3d20db 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -24,6 +24,7 @@
#include "qemu/cutils.h"
#include "sysemu/block-backend.h"
#include "qemu/bitmap.h"
+#include "qemu/error-report.h"
#define BACKUP_CLUSTER_SIZE_DEFAULT (1 << 16)
#define SLICE_TIME 100000000ULL /* ns */
@@ -648,7 +649,16 @@ BlockJob *backup_job_create(const char *job_id,
BlockDriverState *bs,
* backup cluster size is smaller than the target cluster size. Even for
* targets with a backing file, try to avoid COW if possible. */
ret = bdrv_get_info(target, &bdi);
- if (ret < 0 && !target->backing) {
+ if (ret == -ENOTSUP && !target->backing) {
+ /* Cluster size is not defined */
+ error_report("WARNING: The target block device doesn't provide "
+ "information about the block size and it doesn't have a "
+ "backing file. The default block size of %u bytes is "
+ "used. If the actual block size of the target exceeds "
+ "this default, the backup may be unusable",
+ BACKUP_CLUSTER_SIZE_DEFAULT);
+ job->cluster_size = BACKUP_CLUSTER_SIZE_DEFAULT;
+ } else if (ret < 0 && !target->backing) {
error_setg_errno(errp, -ret,
"Couldn't determine the cluster size of the target image, "
"which has no backing file");
--
1.8.3.1
- [Qemu-devel] [PULL 00/12] Block layer fixes for 2.9.0-rc1, Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 01/12] backup: allow target without .bdrv_get_info,
Kevin Wolf <=
- [Qemu-devel] [PULL 02/12] file-posix: Consider max_segments for BlockLimits.max_transfer, Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 04/12] backup: React to bdrv_is_allocated() errors, Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 05/12] vvfat: React to bdrv_is_allocated() errors, Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 06/12] migration: Document handling of bdrv_is_allocated() errors, Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 07/12] block: Remove check_new_perm from bdrv_replace_child(), Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 10/12] block: Refresh filename after changing backing file, Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 12/12] commit: Implement .bdrv_refresh_filename, Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 11/12] mirror: Implement .bdrv_refresh_filename, Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 08/12] block: Request block status from *file for BDRV_BLOCK_RAW, Kevin Wolf, 2017/03/13
- [Qemu-devel] [PULL 09/12] commit: Implement bdrv_commit_top.bdrv_co_get_block_status, Kevin Wolf, 2017/03/13