gwj / at91sam9263 · Commits

Commit 928684128eed56b3c4f4d2300c9cd34d21d02b0c

Authored by j_mayer
1 parent 2662a059

Avoid compilation warnings on 64 bits hosts. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3202 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 12 additions and 6 deletions
block-raw.c
  View file @9286841
@@ -151,7 +151,8 @@ static int raw_pread(BlockDriverState *bs, int64_t offset, @@ -151,7 +151,8 @@ static int raw_pread(BlockDriverState *bs, int64_t offset,
151 if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) { 151 if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) {
152 ++(s->lseek_err_cnt); 152 ++(s->lseek_err_cnt);
153 if(s->lseek_err_cnt <= 10) { 153 if(s->lseek_err_cnt <= 10) {
154 - DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %lld, %p, %d) [%lld] lseek failed : %d = %s\n", 154 + DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %" PRId64 ", %p, %d) [%" PRId64
  155 + "] lseek failed : %d = %s\n",
155 s->fd, bs->filename, offset, buf, count, 156 s->fd, bs->filename, offset, buf, count,
156 bs->total_sectors, errno, strerror(errno)); 157 bs->total_sectors, errno, strerror(errno));
157 } 158 }
@@ -163,7 +164,8 @@ static int raw_pread(BlockDriverState *bs, int64_t offset, @@ -163,7 +164,8 @@ static int raw_pread(BlockDriverState *bs, int64_t offset,
163 if (ret == count) 164 if (ret == count)
164 goto label__raw_read__success; 165 goto label__raw_read__success;
165 166
166 - DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %lld, %p, %d) [%lld] read failed %d : %d = %s\n", 167 + DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %" PRId64 ", %p, %d) [%" PRId64
  168 + "] read failed %d : %d = %s\n",
167 s->fd, bs->filename, offset, buf, count, 169 s->fd, bs->filename, offset, buf, count,
168 bs->total_sectors, ret, errno, strerror(errno)); 170 bs->total_sectors, ret, errno, strerror(errno));
169 171
@@ -178,7 +180,8 @@ static int raw_pread(BlockDriverState *bs, int64_t offset, @@ -178,7 +180,8 @@ static int raw_pread(BlockDriverState *bs, int64_t offset,
178 if (ret == count) 180 if (ret == count)
179 goto label__raw_read__success; 181 goto label__raw_read__success;
180 182
181 - DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %lld, %p, %d) [%lld] retry read failed %d : %d = %s\n", 183 + DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %" PRId64 ", %p, %d) [%" PRId64
  184 + "] retry read failed %d : %d = %s\n",
182 s->fd, bs->filename, offset, buf, count, 185 s->fd, bs->filename, offset, buf, count,
183 bs->total_sectors, ret, errno, strerror(errno)); 186 bs->total_sectors, ret, errno, strerror(errno));
184 } 187 }
@@ -201,7 +204,8 @@ static int raw_pwrite(BlockDriverState *bs, int64_t offset, @@ -201,7 +204,8 @@ static int raw_pwrite(BlockDriverState *bs, int64_t offset,
201 if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) { 204 if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) {
202 ++(s->lseek_err_cnt); 205 ++(s->lseek_err_cnt);
203 if(s->lseek_err_cnt) { 206 if(s->lseek_err_cnt) {
204 - DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %lld, %p, %d) [%lld] lseek failed : %d = %s\n", 207 + DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %" PRId64 ", %p, %d) [%"
  208 + PRId64 "] lseek failed : %d = %s\n",
205 s->fd, bs->filename, offset, buf, count, 209 s->fd, bs->filename, offset, buf, count,
206 bs->total_sectors, errno, strerror(errno)); 210 bs->total_sectors, errno, strerror(errno));
207 } 211 }
@@ -213,7 +217,8 @@ static int raw_pwrite(BlockDriverState *bs, int64_t offset, @@ -213,7 +217,8 @@ static int raw_pwrite(BlockDriverState *bs, int64_t offset,
213 if (ret == count) 217 if (ret == count)
214 goto label__raw_write__success; 218 goto label__raw_write__success;
215 219
216 - DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %lld, %p, %d) [%lld] write failed %d : %d = %s\n", 220 + DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %" PRId64 ", %p, %d) [%" PRId64
  221 + "] write failed %d : %d = %s\n",
217 s->fd, bs->filename, offset, buf, count, 222 s->fd, bs->filename, offset, buf, count,
218 bs->total_sectors, ret, errno, strerror(errno)); 223 bs->total_sectors, ret, errno, strerror(errno));
219 224
block-vmdk.c
  View file @9286841
@@ -659,7 +659,8 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num, @@ -659,7 +659,8 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num,
659 659
660 if (sector_num > bs->total_sectors) { 660 if (sector_num > bs->total_sectors) {
661 fprintf(stderr, 661 fprintf(stderr,
662 - "(VMDK) Wrong offset: sector_num=0x%llx total_sectors=0x%llx\n", 662 + "(VMDK) Wrong offset: sector_num=0x%" PRIx64
  663 + " total_sectors=0x%" PRIx64 "\n",
663 sector_num, bs->total_sectors); 664 sector_num, bs->total_sectors);
664 return -1; 665 return -1;
665 } 666 }