From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yosuke Iwamatsu Subject: [PATCH] qemu-dm: Fix Raw Block IO Debug Print Date: Thu, 13 Sep 2007 19:23:59 +0900 Message-ID: <46E90FBF.6060802@ab.jp.nec.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------090309080702010601020209" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------090309080702010601020209 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, This is a trivial fix for debug print formats of raw block io. Without this patch, qemu-dm occasionally gets stuck when a raw io device is inaccessible (eg. CR-ROM doesn't exist). Regards, ------------------- Yosuke Iwamatsu NEC Corporation --------------090309080702010601020209 Content-Type: text/plain; name="fix_block_raw_print.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="fix_block_raw_print.patch" # HG changeset patch # User Yosuke Iwamatsu # Date 1189661813 -32400 # Node ID 785b0e83cad3458c4bacc1908de4e908f4b95378 # Parent a00cc97b392a8e845f26f05817ffe1edcf8878d6 qemu-dm: fix block-raw io debug print Signed-off-by: Yosuke Iwamatsu diff -r a00cc97b392a -r 785b0e83cad3 tools/ioemu/block-raw.c --- a/tools/ioemu/block-raw.c Wed Sep 12 09:43:33 2007 +0100 +++ b/tools/ioemu/block-raw.c Thu Sep 13 14:36:53 2007 +0900 @@ -150,7 +150,7 @@ static int raw_pread(BlockDriverState *b if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) { ++(s->lseek_err_cnt); if(s->lseek_err_cnt <= 10) { - DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %ld, %p, %d) [%ld] lseek failed : %d = %s\n", + DEBUG_BLOCK_PRINT("raw_pread(%d:%s, %lld, %p, %d) [%lld] lseek failed : %d = %s\n", s->fd, bs->filename, offset, @@ -166,7 +166,7 @@ static int raw_pread(BlockDriverState *b if (ret == count) goto label__raw_read__success; - DEBUG_BLOCK_PRINT("raw_read(%d:%s, %ld, %p, %d) [%ld] read failed %d : %d = %s\n", + DEBUG_BLOCK_PRINT("raw_read(%d:%s, %lld, %p, %d) [%lld] read failed %d : %d = %s\n", s->fd, bs->filename, offset, @@ -185,7 +185,7 @@ static int raw_pread(BlockDriverState *b if (ret == count) goto label__raw_read__success; - DEBUG_BLOCK_PRINT("raw_read(%d:%s, %ld, %p, %d) [%ld] retry read failed %d : %d = %s\n", + DEBUG_BLOCK_PRINT("raw_read(%d:%s, %lld, %p, %d) [%lld] retry read failed %d : %d = %s\n", s->fd, bs->filename, offset, @@ -215,7 +215,7 @@ static int raw_pwrite(BlockDriverState * if (lseek(s->fd, offset, SEEK_SET) == (off_t)-1) { ++(s->lseek_err_cnt); if(s->lseek_err_cnt) { - DEBUG_BLOCK_PRINT("raw_write(%d:%s, %ld, %p, %d) [%ld] lseek failed : %d = %s\n", + DEBUG_BLOCK_PRINT("raw_write(%d:%s, %lld, %p, %d) [%lld] lseek failed : %d = %s\n", s->fd, bs->filename, offset, @@ -231,7 +231,7 @@ static int raw_pwrite(BlockDriverState * if (ret == count) goto label__raw_write__success; - DEBUG_BLOCK_PRINT("raw_write(%d:%s, %ld, %p, %d) [%ld] write failed %d : %d = %s\n", + DEBUG_BLOCK_PRINT("raw_write(%d:%s, %lld, %p, %d) [%lld] write failed %d : %d = %s\n", s->fd, bs->filename, offset, --------------090309080702010601020209 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------090309080702010601020209--