aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-04-07 16:52:34 +0200
committerKevin Wolf <kwolf@redhat.com>2016-04-12 18:06:51 +0200
commit40a99aace3f9ffd65af07a89c381db3550b22316 (patch)
treee2a235bc1d95ac54913fac51dcd32d892d53c7ea /block
parent1fd06db03da73db868e54b838bb5ea02c10eea6c (diff)
vpc: fix return value check for blk_pwrite
bdrv_pwrite_sync used to return zero or negative error, while blk_pwrite returns the number of written bytes when successful. This caused VPC image creation to fail spectacularly: it wrote the first 512 bytes, and then exited immediately because of the non-zero answer from blk_pwrite. But the truly spectacular part is that it returns a positive value (the 512 that blk_pwrite returned) causing everyone to believe that it succeeded. This fixes qemu-iotests with vpc format. Fixes: b8f45cdf7827e39f9a1e6cc446f5972cc6144237 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/vpc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/vpc.c b/block/vpc.c
index 8830b5b2b0..3713ec3a5f 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -775,7 +775,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t *buf,
num_bat_entries = (total_sectors + block_size / 512) / (block_size / 512);
ret = blk_pwrite(blk, offset, buf, HEADER_SIZE);
- if (ret) {
+ if (ret < 0) {
goto fail;
}