OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Use logfile only when loglevel is set (http://bugzilla.openmoko.org/cgi-bin/bugz

Browse Source 
illa/show_bug.cgi?id=886).
raw_pread() and raw_pwrite() are expected to return number of bytes read.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3193 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2007-09-20 12:42:24 +00:00
parent cbecba264b
commit a50a6282d7
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block-raw.c
View File

@ -61,7 +61,8 @@
#define DEBUG_BLOCK #define DEBUG_BLOCK
#if defined(DEBUG_BLOCK) && !defined(QEMU_TOOL) #if defined(DEBUG_BLOCK) && !defined(QEMU_TOOL)
#define DEBUG_BLOCK_PRINT(formatCstr, args...) fprintf(logfile, formatCstr, ##args); fflush(logfile) #define DEBUG_BLOCK_PRINT(formatCstr, args...) do { if (loglevel != 0) \
{ fprintf(stderr, formatCstr, ##args); fflush(stderr); } } while (0)
#else #else
#define DEBUG_BLOCK_PRINT(formatCstr, args...) #define DEBUG_BLOCK_PRINT(formatCstr, args...)
#endif #endif
@ -162,7 +163,7 @@ 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_read(%d:%s, %lld, %p, %d) [%lld] read failed %d : %d = %s\n", DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %lld, %p, %d) [%lld] 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));
@ -177,13 +178,11 @@ 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_read(%d:%s, %lld, %p, %d) [%lld] retry read failed %d : %d = %s\n", DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %lld, %p, %d) [%lld] 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));
} }
return -1;
label__raw_read__success: label__raw_read__success:
return ret; return ret;
@ -202,7 +201,7 @@ 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_write(%d:%s, %lld, %p, %d) [%lld] lseek failed : %d = %s\n", DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %lld, %p, %d) [%lld] 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));
} }
@ -214,12 +213,10 @@ 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_write(%d:%s, %lld, %p, %d) [%lld] write failed %d : %d = %s\n", DEBUG_BLOCK_PRINT("raw_pwrite(%d:%s, %lld, %p, %d) [%lld] 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));
return -1;
label__raw_write__success: label__raw_write__success:
return ret; return ret;