mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-24 19:33:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

block: Use correct width in format strings

Browse Source 
Instead of blindly relying on a normal integer having a width of 32 bits
(which is a pretty good assumption, but we should not rely on it if
there is no need), use the correct format string macros.

This does not touch DEBUG output.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2014-04-29 19:03:12 +02:00 committed by Kevin Wolf
parent 91f827dcff
commit 521b2b5df0
6 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/cow.c
View File

@ -82,7 +82,7 @@ static int cow_open(BlockDriverState *bs, QDict *options, int flags,
if (be32_to_cpu(cow_header.version) != COW_VERSION) { if (be32_to_cpu(cow_header.version) != COW_VERSION) {
char version[64]; char version[64];
snprintf(version, sizeof(version), snprintf(version, sizeof(version),
"COW version %d", cow_header.version); "COW version %" PRIu32, cow_header.version);
error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
bs->device_name, "cow", version); bs->device_name, "cow", version);
ret = -ENOTSUP; ret = -ENOTSUP;

8
block/dmg.c
View File

@ -248,8 +248,8 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
offset += 8; offset += 8;
if (s->sectorcounts[i] > DMG_SECTORCOUNTS_MAX) { if (s->sectorcounts[i] > DMG_SECTORCOUNTS_MAX) {
error_report("sector count %" PRIu64 " for chunk %u is " error_report("sector count %" PRIu64 " for chunk %" PRIu32
"larger than max (%u)", " is larger than max (%u)",
s->sectorcounts[i], i, DMG_SECTORCOUNTS_MAX); s->sectorcounts[i], i, DMG_SECTORCOUNTS_MAX);
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
@ -269,8 +269,8 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
offset += 8; offset += 8;
if (s->lengths[i] > DMG_LENGTHS_MAX) { if (s->lengths[i] > DMG_LENGTHS_MAX) {
error_report("length %" PRIu64 " for chunk %u is larger " error_report("length %" PRIu64 " for chunk %" PRIu32
"than max (%u)", " is larger than max (%u)",
s->lengths[i], i, DMG_LENGTHS_MAX); s->lengths[i], i, DMG_LENGTHS_MAX);
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;

3
block/qcow.c
View File

@ -119,7 +119,8 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
} }
if (header.version != QCOW_VERSION) { if (header.version != QCOW_VERSION) {
char version[64]; char version[64];
snprintf(version, sizeof(version), "QCOW version %d", header.version); snprintf(version, sizeof(version), "QCOW version %" PRIu32,
header.version);
error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
bs->device_name, "qcow", version); bs->device_name, "qcow", version);
ret = -ENOTSUP; ret = -ENOTSUP;

12
block/qcow2.c
View File

@ -124,8 +124,9 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,
case QCOW2_EXT_MAGIC_BACKING_FORMAT: case QCOW2_EXT_MAGIC_BACKING_FORMAT:
if (ext.len >= sizeof(bs->backing_format)) { if (ext.len >= sizeof(bs->backing_format)) {
error_setg(errp, "ERROR: ext_backing_format: len=%u too large" error_setg(errp, "ERROR: ext_backing_format: len=%" PRIu32
" (>=%zu)", ext.len, sizeof(bs->backing_format)); " too large (>=%zu)", ext.len,
sizeof(bs->backing_format));
return 2; return 2;
} }
ret = bdrv_pread(bs->file, offset, bs->backing_format, ext.len); ret = bdrv_pread(bs->file, offset, bs->backing_format, ext.len);
@ -483,7 +484,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
goto fail; goto fail;
} }
if (header.version < 2 || header.version > 3) { if (header.version < 2 || header.version > 3) {
report_unsupported(bs, errp, "QCOW version %d", header.version); report_unsupported(bs, errp, "QCOW version %" PRIu32, header.version);
ret = -ENOTSUP; ret = -ENOTSUP;
goto fail; goto fail;
} }
@ -493,7 +494,8 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
/* Initialise cluster size */ /* Initialise cluster size */
if (header.cluster_bits < MIN_CLUSTER_BITS || if (header.cluster_bits < MIN_CLUSTER_BITS ||
header.cluster_bits > MAX_CLUSTER_BITS) { header.cluster_bits > MAX_CLUSTER_BITS) {
error_setg(errp, "Unsupported cluster size: 2^%i", header.cluster_bits); error_setg(errp, "Unsupported cluster size: 2^%" PRIu32,
header.cluster_bits);
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} }
@ -591,7 +593,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
s->refcount_order = header.refcount_order; s->refcount_order = header.refcount_order;
if (header.crypt_method > QCOW_CRYPT_AES) { if (header.crypt_method > QCOW_CRYPT_AES) {
error_setg(errp, "Unsupported encryption method: %i", error_setg(errp, "Unsupported encryption method: %" PRIu32,
header.crypt_method); header.crypt_method);
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;

6
block/sheepdog.c
View File

@ -1099,7 +1099,7 @@ static int find_vdi_name(BDRVSheepdogState *s, const char *filename,
} }
if (rsp->result != SD_RES_SUCCESS) { if (rsp->result != SD_RES_SUCCESS) {
error_report("cannot get vdi info, %s, %s %d %s", error_report("cannot get vdi info, %s, %s %" PRIu32 " %s",
sd_strerror(rsp->result), filename, snapid, tag); sd_strerror(rsp->result), filename, snapid, tag);
if (rsp->result == SD_RES_NO_VDI) { if (rsp->result == SD_RES_NO_VDI) {
ret = -ENOENT; ret = -ENOENT;
@ -2316,8 +2316,8 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
sn_tab[found].vm_state_size = inode.vm_state_size; sn_tab[found].vm_state_size = inode.vm_state_size;
sn_tab[found].vm_clock_nsec = inode.vm_clock_nsec; sn_tab[found].vm_clock_nsec = inode.vm_clock_nsec;
snprintf(sn_tab[found].id_str, sizeof(sn_tab[found].id_str), "%u", snprintf(sn_tab[found].id_str, sizeof(sn_tab[found].id_str),
inode.snap_id); "%" PRIu32, inode.snap_id);
pstrcpy(sn_tab[found].name, pstrcpy(sn_tab[found].name,
MIN(sizeof(sn_tab[found].name), sizeof(inode.tag)), MIN(sizeof(sn_tab[found].name), sizeof(inode.tag)),
inode.tag); inode.tag);

21
block/vdi.c
View File

@ -408,34 +408,35 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
} }
if (header.signature != VDI_SIGNATURE) { if (header.signature != VDI_SIGNATURE) {
error_setg(errp, "Image not in VDI format (bad signature %08x)", header.signature); error_setg(errp, "Image not in VDI format (bad signature %08" PRIx32
")", header.signature);
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;
} else if (header.version != VDI_VERSION_1_1) { } else if (header.version != VDI_VERSION_1_1) {
error_setg(errp, "unsupported VDI image (version %u.%u)", error_setg(errp, "unsupported VDI image (version %" PRIu32 ".%" PRIu32
header.version >> 16, header.version & 0xffff); ")", header.version >> 16, header.version & 0xffff);
ret = -ENOTSUP; ret = -ENOTSUP;
goto fail; goto fail;
} else if (header.offset_bmap % SECTOR_SIZE != 0) { } else if (header.offset_bmap % SECTOR_SIZE != 0) {
/* We only support block maps which start on a sector boundary. */ /* We only support block maps which start on a sector boundary. */
error_setg(errp, "unsupported VDI image (unaligned block map offset " error_setg(errp, "unsupported VDI image (unaligned block map offset "
"0x%x)", header.offset_bmap); "0x%" PRIx32 ")", header.offset_bmap);
ret = -ENOTSUP; ret = -ENOTSUP;
goto fail; goto fail;
} else if (header.offset_data % SECTOR_SIZE != 0) { } else if (header.offset_data % SECTOR_SIZE != 0) {
/* We only support data blocks which start on a sector boundary. */ /* We only support data blocks which start on a sector boundary. */
error_setg(errp, "unsupported VDI image (unaligned data offset 0x%x)", error_setg(errp, "unsupported VDI image (unaligned data offset 0x%"
header.offset_data); PRIx32 ")", header.offset_data);
ret = -ENOTSUP; ret = -ENOTSUP;
goto fail; goto fail;
} else if (header.sector_size != SECTOR_SIZE) { } else if (header.sector_size != SECTOR_SIZE) {
error_setg(errp, "unsupported VDI image (sector size %u is not %u)", error_setg(errp, "unsupported VDI image (sector size %" PRIu32
header.sector_size, SECTOR_SIZE); " is not %u)", header.sector_size, SECTOR_SIZE);
ret = -ENOTSUP; ret = -ENOTSUP;
goto fail; goto fail;
} else if (header.block_size != DEFAULT_CLUSTER_SIZE) { } else if (header.block_size != DEFAULT_CLUSTER_SIZE) {
error_setg(errp, "unsupported VDI image (block size %u is not %u)", error_setg(errp, "unsupported VDI image (block size %" PRIu32
header.block_size, DEFAULT_CLUSTER_SIZE); " is not %u)", header.block_size, DEFAULT_CLUSTER_SIZE);
ret = -ENOTSUP; ret = -ENOTSUP;
goto fail; goto fail;
} else if (header.disk_size > } else if (header.disk_size >