Avoid compilation warnings on 64 bits hosts.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3202 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
2662a059aa
commit
928684128e
15
block-raw.c
15
block-raw.c
|
@ -151,7 +151,8 @@ static int raw_pread(BlockDriverState *bs, int64_t offset,
|
||||||
if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) {
|
if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) {
|
||||||
++(s->lseek_err_cnt);
|
++(s->lseek_err_cnt);
|
||||||
if(s->lseek_err_cnt <= 10) {
|
if(s->lseek_err_cnt <= 10) {
|
||||||
DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %lld, %p, %d) [%lld] lseek failed : %d = %s\n",
|
DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %" PRId64 ", %p, %d) [%" PRId64
|
||||||
|
"] lseek failed : %d = %s\n",
|
||||||
s->fd, bs->filename, offset, buf, count,
|
s->fd, bs->filename, offset, buf, count,
|
||||||
bs->total_sectors, errno, strerror(errno));
|
bs->total_sectors, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
|
@ -163,7 +164,8 @@ static int raw_pread(BlockDriverState *bs, int64_t offset,
|
||||||
if (ret == count)
|
if (ret == count)
|
||||||
goto label__raw_read__success;
|
goto label__raw_read__success;
|
||||||
|
|
||||||
DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %lld, %p, %d) [%lld] read failed %d : %d = %s\n",
|
DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %" PRId64 ", %p, %d) [%" PRId64
|
||||||
|
"] read failed %d : %d = %s\n",
|
||||||
s->fd, bs->filename, offset, buf, count,
|
s->fd, bs->filename, offset, buf, count,
|
||||||
bs->total_sectors, ret, errno, strerror(errno));
|
bs->total_sectors, ret, errno, strerror(errno));
|
||||||
|
|
||||||
|
@ -178,7 +180,8 @@ static int raw_pread(BlockDriverState *bs, int64_t offset,
|
||||||
if (ret == count)
|
if (ret == count)
|
||||||
goto label__raw_read__success;
|
goto label__raw_read__success;
|
||||||
|
|
||||||
DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %lld, %p, %d) [%lld] retry read failed %d : %d = %s\n",
|
DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %" PRId64 ", %p, %d) [%" PRId64
|
||||||
|
"] retry read failed %d : %d = %s\n",
|
||||||
s->fd, bs->filename, offset, buf, count,
|
s->fd, bs->filename, offset, buf, count,
|
||||||
bs->total_sectors, ret, errno, strerror(errno));
|
bs->total_sectors, ret, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
|
@ -201,7 +204,8 @@ static int raw_pwrite(BlockDriverState *bs, int64_t offset,
|
||||||
if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) {
|
if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) {
|
||||||
++(s->lseek_err_cnt);
|
++(s->lseek_err_cnt);
|
||||||
if(s->lseek_err_cnt) {
|
if(s->lseek_err_cnt) {
|
||||||
DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %lld, %p, %d) [%lld] lseek failed : %d = %s\n",
|
DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %" PRId64 ", %p, %d) [%"
|
||||||
|
PRId64 "] lseek failed : %d = %s\n",
|
||||||
s->fd, bs->filename, offset, buf, count,
|
s->fd, bs->filename, offset, buf, count,
|
||||||
bs->total_sectors, errno, strerror(errno));
|
bs->total_sectors, errno, strerror(errno));
|
||||||
}
|
}
|
||||||
|
@ -213,7 +217,8 @@ static int raw_pwrite(BlockDriverState *bs, int64_t offset,
|
||||||
if (ret == count)
|
if (ret == count)
|
||||||
goto label__raw_write__success;
|
goto label__raw_write__success;
|
||||||
|
|
||||||
DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %lld, %p, %d) [%lld] write failed %d : %d = %s\n",
|
DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %" PRId64 ", %p, %d) [%" PRId64
|
||||||
|
"] write failed %d : %d = %s\n",
|
||||||
s->fd, bs->filename, offset, buf, count,
|
s->fd, bs->filename, offset, buf, count,
|
||||||
bs->total_sectors, ret, errno, strerror(errno));
|
bs->total_sectors, ret, errno, strerror(errno));
|
||||||
|
|
||||||
|
|
|
@ -659,7 +659,8 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num,
|
||||||
|
|
||||||
if (sector_num > bs->total_sectors) {
|
if (sector_num > bs->total_sectors) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"(VMDK) Wrong offset: sector_num=0x%llx total_sectors=0x%llx\n",
|
"(VMDK) Wrong offset: sector_num=0x%" PRIx64
|
||||||
|
" total_sectors=0x%" PRIx64 "\n",
|
||||||
sector_num, bs->total_sectors);
|
sector_num, bs->total_sectors);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue