Commit 521b2b5d authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block: Use correct width in format strings 



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: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 91f827dc

block/cow.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int cow_open(BlockDriverState *bs, QDict *options, int flags, 
    if (be32_to_cpu(cow_header.version) != COW_VERSION) {

        char version[64];

        snprintf(version, sizeof(version),

               "COW version %d", cow_header.version);

               "COW version %" PRIu32, cow_header.version);

        error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,

            bs->device_name, "cow", version);

        ret = -ENOTSUP;

block/dmg.c

+4 −4
Original line number Diff line number Diff line
@@ -248,8 +248,8 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags, 
                offset += 8;



                if (s->sectorcounts[i] > DMG_SECTORCOUNTS_MAX) {

                    error_report("sector count %" PRIu64 " for chunk %u is "

                                 "larger than max (%u)",

                    error_report("sector count %" PRIu64 " for chunk %" PRIu32

                                 " is larger than max (%u)",

                                 s->sectorcounts[i], i, DMG_SECTORCOUNTS_MAX);

                    ret = -EINVAL;

                    goto fail;
@@ -269,8 +269,8 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags, 
                offset += 8;



                if (s->lengths[i] > DMG_LENGTHS_MAX) {

                    error_report("length %" PRIu64 " for chunk %u is larger "

                                 "than max (%u)",

                    error_report("length %" PRIu64 " for chunk %" PRIu32

                                 " is larger than max (%u)",

                                 s->lengths[i], i, DMG_LENGTHS_MAX);

                    ret = -EINVAL;

                    goto fail;

block/qcow.c

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, 
    }

    if (header.version != QCOW_VERSION) {

        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,

                  bs->device_name, "qcow", version);

        ret = -ENOTSUP;

block/qcow2.c

+7 −5
Original line number Diff line number Diff line
@@ -124,8 +124,9 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, 


        case QCOW2_EXT_MAGIC_BACKING_FORMAT:

            if (ext.len >= sizeof(bs->backing_format)) {

                error_setg(errp, "ERROR: ext_backing_format: len=%u too large"

                           " (>=%zu)", ext.len, sizeof(bs->backing_format));

                error_setg(errp, "ERROR: ext_backing_format: len=%" PRIu32

                           " too large (>=%zu)", ext.len,

                           sizeof(bs->backing_format));

                return 2;

            }

            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;

    }

    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;

        goto fail;

    }
@@ -493,7 +494,8 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, 
    /* Initialise cluster size */

    if (header.cluster_bits < MIN_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;

        goto fail;

    }
@@ -591,7 +593,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, 
    s->refcount_order = header.refcount_order;



    if (header.crypt_method > QCOW_CRYPT_AES) {

        error_setg(errp, "Unsupported encryption method: %i",

        error_setg(errp, "Unsupported encryption method: %" PRIu32,

                   header.crypt_method);

        ret = -EINVAL;

        goto fail;

block/sheepdog.c

+3 −3
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ static int find_vdi_name(BDRVSheepdogState *s, const char *filename, 
    }



    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);

        if (rsp->result == SD_RES_NO_VDI) {

            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_clock_nsec = inode.vm_clock_nsec;



            snprintf(sn_tab[found].id_str, sizeof(sn_tab[found].id_str), "%u",

                     inode.snap_id);

            snprintf(sn_tab[found].id_str, sizeof(sn_tab[found].id_str),

                     "%" PRIu32, inode.snap_id);

            pstrcpy(sn_tab[found].name,

                    MIN(sizeof(sn_tab[found].name), sizeof(inode.tag)),

                    inode.tag);