david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: use the standard 'ret' instead of 'result'

Browse Source 
Most QEMU code uses 'ret' for function return values. The VDI driver
uses a mix of 'result' and 'ret'.  This cleans that up, switching over
to the standard 'ret' usage.

Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Jeff Cody 2014-07-23 17:22:59 -04:00 committed by Kevin Wolf
parent 70747862f1
commit dddc7750d6
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
block/vdi.c
View File

@ -350,23 +350,23 @@ static int vdi_make_empty(BlockDriverState *bs)
static int vdi_probe(const uint8_t *buf, int buf_size, const char *filename) static int vdi_probe(const uint8_t *buf, int buf_size, const char *filename)
{ {
const VdiHeader *header = (const VdiHeader *)buf; const VdiHeader *header = (const VdiHeader *)buf;
int result = 0; int ret = 0;
logout("\n"); logout("\n");
if (buf_size < sizeof(*header)) { if (buf_size < sizeof(*header)) {
/* Header too small, no VDI. */ /* Header too small, no VDI. */
} else if (le32_to_cpu(header->signature) == VDI_SIGNATURE) { } else if (le32_to_cpu(header->signature) == VDI_SIGNATURE) {
result = 100; ret = 100;
} }
if (result == 0) { if (ret == 0) {
logout("no vdi image\n"); logout("no vdi image\n");
} else { } else {
logout("%s", header->text); logout("%s", header->text);
} }
return result; return ret;
} }
static int vdi_open(BlockDriverState *bs, QDict *options, int flags, static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
@ -674,7 +674,7 @@ static int vdi_co_write(BlockDriverState *bs,
static int vdi_create(const char *filename, QemuOpts *opts, Error **errp) static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
{ {
int result = 0; int ret = 0;
uint64_t bytes = 0; uint64_t bytes = 0;
uint32_t blocks; uint32_t blocks;
size_t block_size = DEFAULT_CLUSTER_SIZE; size_t block_size = DEFAULT_CLUSTER_SIZE;
@ -704,21 +704,21 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
#endif #endif
if (bytes > VDI_DISK_SIZE_MAX) { if (bytes > VDI_DISK_SIZE_MAX) {
result = -ENOTSUP; ret = -ENOTSUP;
error_setg(errp, "Unsupported VDI image size (size is 0x%" PRIx64 error_setg(errp, "Unsupported VDI image size (size is 0x%" PRIx64
", max supported is 0x%" PRIx64 ")", ", max supported is 0x%" PRIx64 ")",
bytes, VDI_DISK_SIZE_MAX); bytes, VDI_DISK_SIZE_MAX);
goto exit; goto exit;
} }
result = bdrv_create_file(filename, opts, &local_err); ret = bdrv_create_file(filename, opts, &local_err);
if (result < 0) { if (ret < 0) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
goto exit; goto exit;
} }
result = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL, ret = bdrv_open(&bs, filename, NULL, NULL, BDRV_O_RDWR | BDRV_O_PROTOCOL,
NULL, &local_err); NULL, &local_err);
if (result < 0) { if (ret < 0) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
goto exit; goto exit;
} }
@ -752,8 +752,8 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
vdi_header_print(&header); vdi_header_print(&header);
#endif #endif
vdi_header_to_le(&header); vdi_header_to_le(&header);
result = bdrv_pwrite_sync(bs, offset, &header, sizeof(header)); ret = bdrv_pwrite_sync(bs, offset, &header, sizeof(header));
if (result < 0) { if (ret < 0) {
error_setg(errp, "Error writing header to %s", filename); error_setg(errp, "Error writing header to %s", filename);
goto exit; goto exit;
} }
@ -768,8 +768,8 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
bmap[i] = VDI_UNALLOCATED; bmap[i] = VDI_UNALLOCATED;
} }
} }
result = bdrv_pwrite_sync(bs, offset, bmap, bmap_size); ret = bdrv_pwrite_sync(bs, offset, bmap, bmap_size);
if (result < 0) { if (ret < 0) {
error_setg(errp, "Error writing bmap to %s", filename); error_setg(errp, "Error writing bmap to %s", filename);
goto exit; goto exit;
} }
@ -777,8 +777,8 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
} }
if (image_type == VDI_TYPE_STATIC) { if (image_type == VDI_TYPE_STATIC) {
result = bdrv_truncate(bs, offset + blocks * block_size); ret = bdrv_truncate(bs, offset + blocks * block_size);
if (result < 0) { if (ret < 0) {
error_setg(errp, "Failed to statically allocate %s", filename); error_setg(errp, "Failed to statically allocate %s", filename);
goto exit; goto exit;
} }
@ -787,7 +787,7 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
exit: exit:
bdrv_unref(bs); bdrv_unref(bs);
g_free(bmap); g_free(bmap);
return result; return ret;
} }
static void vdi_close(BlockDriverState *bs) static void vdi_close(BlockDriverState *bs)