From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57321 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1PNz-0005dY-L6 for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:05:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P1PNy-0004gc-F6 for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:05:47 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:61990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P1PNy-0004gS-1p for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:05:46 -0400 From: Stefan Weil Date: Thu, 30 Sep 2010 22:05:42 +0200 Message-Id: <1285877142-15237-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] rc4030: Fix compilation error in debug code List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: Blue Swirl min was unknown here, so avoid it. Cc: Blue Swirl Signed-off-by: Stefan Weil --- hw/rc4030.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/rc4030.c b/hw/rc4030.c index 2231373..abbc3eb 100644 --- a/hw/rc4030.c +++ b/hw/rc4030.c @@ -749,7 +749,10 @@ static void rc4030_do_dma(void *opaque, int n, uint8_t *buf, int len, int is_wri printf("rc4030 dma: Copying %d bytes %s host %p\n", len, is_write ? "from" : "to", buf); for (i = 0; i < len; i += 16) { - int n = min(16, len - i); + int n = 16; + if (n > len - i) { + n = len - i; + } for (j = 0; j < n; j++) printf("%02x ", buf[i + j]); while (j++ < 16) -- 1.7.1