| From b343626ad339c1bb1cd1867a9f9ade2067c6d345 Mon Sep 17 00:00:00 2001 |
| Message-Id: <b343626ad339c1bb1cd1867a9f9ade2067c6d345.1418766606.git.jen@redhat.com> |
| In-Reply-To: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com> |
| References: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com> |
| From: Fam Zheng <famz@redhat.com> |
| Date: Thu, 4 Dec 2014 00:05:10 -0600 |
| Subject: [CHANGE 16/31] vmdk: Fix %d and %lld to PRI* in format strings |
| To: rhvirt-patches@redhat.com, |
| jen@redhat.com |
| |
| RH-Author: Fam Zheng <famz@redhat.com> |
| Message-id: <1417651524-18041-17-git-send-email-famz@redhat.com> |
| Patchwork-id: 62689 |
| O-Subject: [RHEL-7.1 qemu-kvm PATCH v5 16/30] vmdk: Fix %d and %lld to PRI* in format strings |
| Bugzilla: 1134251 |
| RH-Acked-by: Jeffrey Cody <jcody@redhat.com> |
| RH-Acked-by: Markus Armbruster <armbru@redhat.com> |
| RH-Acked-by: Max Reitz <mreitz@redhat.com> |
| |
| Signed-off-by: Fam Zheng <famz@redhat.com> |
| Signed-off-by: Kevin Wolf <kwolf@redhat.com> |
| (cherry picked from commit 4ab9dab5b9be0381e714d3fbe518689a72459011) |
| Signed-off-by: Fam Zheng <famz@redhat.com> |
| Signed-off-by: Jeff E. Nelson <jen@redhat.com> |
| |
| block/vmdk.c | 13 +++++++------ |
| 1 file changed, 7 insertions(+), 6 deletions(-) |
| |
| diff --git a/block/vmdk.c b/block/vmdk.c |
| index e78a184..0a01a2b 100644 |
| |
| |
| @@ -640,7 +640,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, |
| |
| if (le32_to_cpu(header.version) > 3) { |
| char buf[64]; |
| - snprintf(buf, sizeof(buf), "VMDK version %d", |
| + snprintf(buf, sizeof(buf), "VMDK version %" PRId32, |
| le32_to_cpu(header.version)); |
| error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, |
| bs->device_name, "vmdk", buf); |
| @@ -671,8 +671,9 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, |
| } |
| if (bdrv_getlength(file) < |
| le64_to_cpu(header.grain_offset) * BDRV_SECTOR_SIZE) { |
| - error_setg(errp, "File truncated, expecting at least %lld bytes", |
| - le64_to_cpu(header.grain_offset) * BDRV_SECTOR_SIZE); |
| + error_setg(errp, "File truncated, expecting at least %" PRId64 " bytes", |
| + (int64_t)(le64_to_cpu(header.grain_offset) |
| + * BDRV_SECTOR_SIZE)); |
| return -EINVAL; |
| } |
| |
| @@ -1717,7 +1718,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options, |
| "\n" |
| "ddb.virtualHWVersion = \"%d\"\n" |
| "ddb.geometry.cylinders = \"%" PRId64 "\"\n" |
| - "ddb.geometry.heads = \"%d\"\n" |
| + "ddb.geometry.heads = \"%" PRIu32 "\"\n" |
| "ddb.geometry.sectors = \"63\"\n" |
| "ddb.adapterType = \"%s\"\n"; |
| |
| @@ -1777,9 +1778,9 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options, |
| strcmp(fmt, "twoGbMaxExtentFlat")); |
| compress = !strcmp(fmt, "streamOptimized"); |
| if (flat) { |
| - desc_extent_line = "RW %lld FLAT \"%s\" 0\n"; |
| + desc_extent_line = "RW %" PRId64 " FLAT \"%s\" 0\n"; |
| } else { |
| - desc_extent_line = "RW %lld SPARSE \"%s\"\n"; |
| + desc_extent_line = "RW %" PRId64 " SPARSE \"%s\"\n"; |
| } |
| if (flat && backing_file) { |
| error_setg(errp, "Flat image can't have backing file"); |
| -- |
| 2.1.0 |
| |