@@ -152,7 +152,7 @@ fail:
}
/* add at the end of the file a new list of snapshots */
-static int qcow2_write_snapshots(BlockDriverState *bs)
+static int qcow2_write_snapshots(BlockDriverState *bs, Error **errp)
{
BDRVQcowState *s = bs->opaque;
QCowSnapshot *sn;
@@ -183,10 +183,15 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
offset = snapshots_offset;
if (offset < 0) {
ret = offset;
+ error_setg_errno(errp, -ret,
+ "Failed in allocation of cluster for snapshot list");
goto fail;
}
ret = bdrv_flush(bs);
if (ret < 0) {
+ error_setg_errno(errp, -ret,
+ "Failed in flush after snapshot list cluster "
+ "allocation");
goto fail;
}
@@ -194,6 +199,10 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
* must indeed be completely free */
ret = qcow2_pre_write_overlap_check(bs, 0, offset, snapshots_size);
if (ret < 0) {
+ error_setg_errno(errp, -ret,
+ "Failed in overlap check for snapshot list cluster "
+ "at %" PRIi64 " with size %d",
+ offset, snapshots_size);
goto fail;
}
@@ -227,24 +236,40 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
ret = bdrv_pwrite(bs->file, offset, &h, sizeof(h));
if (ret < 0) {
+ error_setg_errno(errp, -ret,
+ "Failed in write of snapshot header at %"
+ PRIi64 " with size %d",
+ offset, (int)sizeof(h));
goto fail;
}
offset += sizeof(h);
ret = bdrv_pwrite(bs->file, offset, &extra, sizeof(extra));
if (ret < 0) {
+ error_setg_errno(errp, -ret,
+ "Failed in write of extra snapshot data at %"
+ PRIi64 " with size %d",
+ offset, (int)sizeof(extra));
goto fail;
}
offset += sizeof(extra);
ret = bdrv_pwrite(bs->file, offset, sn->id_str, id_str_size);
if (ret < 0) {
+ error_setg_errno(errp, -ret,
+ "Failed in write of snapshot id string at %"
+ PRIi64 " with size %d",
+ offset, id_str_size);
goto fail;
}
offset += id_str_size;
ret = bdrv_pwrite(bs->file, offset, sn->name, name_size);
if (ret < 0) {
+ error_setg_errno(errp, -ret,
+ "Failed in write of snapshot name string at %"
+ PRIi64 " with size %d",
+ offset, name_size);
goto fail;
}
offset += name_size;
@@ -256,6 +281,8 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
*/
ret = bdrv_flush(bs);
if (ret < 0) {
+ error_setg_errno(errp, -ret,
+ "Failed in flush after snapshot list update");
goto fail;
}
@@ -268,6 +295,10 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, nb_snapshots),
&header_data, sizeof(header_data));
if (ret < 0) {
+ error_setg_errno(errp, -ret,
+ "Failed in update of image header at %d with size %d",
+ (int)offsetof(QCowHeader, nb_snapshots),
+ (int)sizeof(header_data));
goto fail;
}
@@ -283,6 +314,9 @@ fail:
qcow2_free_clusters(bs, snapshots_offset, snapshots_size,
QCOW2_DISCARD_ALWAYS);
}
+ if (errp) {
+ g_assert(error_is_set(errp));
+ }
return ret;
}
@@ -447,10 +481,8 @@ void qcow2_snapshot_create(BlockDriverState *bs,
s->snapshots = new_snapshot_list;
s->snapshots[s->nb_snapshots++] = *sn;
- ret = qcow2_write_snapshots(bs);
+ ret = qcow2_write_snapshots(bs, errp);
if (ret < 0) {
- /* Following line will be replaced with more detailed error later */
- error_setg(errp, "Failed in write of snapshot");
g_free(s->snapshots);
s->snapshots = old_snapshot_list;
s->nb_snapshots--;
@@ -624,9 +656,8 @@ int qcow2_snapshot_delete(BlockDriverState *bs,
s->snapshots + snapshot_index + 1,
(s->nb_snapshots - snapshot_index - 1) * sizeof(sn));
s->nb_snapshots--;
- ret = qcow2_write_snapshots(bs);
+ ret = qcow2_write_snapshots(bs, errp);
if (ret < 0) {
- error_setg(errp, "Failed to remove snapshot from snapshot list");
return ret;
}