Fix warning, based on patches by Zeev Tarantov and Jindrich Makovicka

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5340 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-09-28 20:00:14 +00:00
parent c9b1ae2cfd
commit 7fd6d9fc87

View File

@ -710,13 +710,13 @@ static int vmdk_create(const char *filename, int64_t total_size,
"createType=\"monolithicSparse\"\n" "createType=\"monolithicSparse\"\n"
"\n" "\n"
"# Extent description\n" "# Extent description\n"
"RW %lu SPARSE \"%s\"\n" "RW %" PRId64 " SPARSE \"%s\"\n"
"\n" "\n"
"# The Disk Data Base \n" "# The Disk Data Base \n"
"#DDB\n" "#DDB\n"
"\n" "\n"
"ddb.virtualHWVersion = \"%d\"\n" "ddb.virtualHWVersion = \"%d\"\n"
"ddb.geometry.cylinders = \"%lu\"\n" "ddb.geometry.cylinders = \"%" PRId64 "\"\n"
"ddb.geometry.heads = \"16\"\n" "ddb.geometry.heads = \"16\"\n"
"ddb.geometry.sectors = \"63\"\n" "ddb.geometry.sectors = \"63\"\n"
"ddb.adapterType = \"ide\"\n"; "ddb.adapterType = \"ide\"\n";
@ -792,8 +792,9 @@ static int vmdk_create(const char *filename, int64_t total_size,
if ((temp_str = strrchr(real_filename, ':')) != NULL) if ((temp_str = strrchr(real_filename, ':')) != NULL)
real_filename = temp_str + 1; real_filename = temp_str + 1;
snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL), snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL),
(unsigned long)total_size, real_filename, total_size, real_filename,
(flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), total_size / (63 * 16)); (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
total_size / (int64_t)(63 * 16));
/* write the descriptor */ /* write the descriptor */
lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET); lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET);