From patchwork Mon Sep 13 12:37:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Novotny X-Patchwork-Id: 64586 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 06FDEB6EE9 for ; Mon, 13 Sep 2010 22:36:29 +1000 (EST) Received: from localhost ([127.0.0.1]:59490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ov8Gn-0006Db-Dl for incoming@patchwork.ozlabs.org; Mon, 13 Sep 2010 08:36:25 -0400 Received: from [140.186.70.92] (port=39007 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ov8GD-0006DW-Mh for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:35:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ov8GC-0003LZ-BV for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:35:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44325) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ov8GC-0003LS-08 for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:35:48 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8DCZj17001397 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 Sep 2010 08:35:45 -0400 Received: from mig-laptop.brq.redhat.com (mig-laptop.brq.redhat.com [10.34.26.9]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8DCZhOM025608; Mon, 13 Sep 2010 08:35:43 -0400 Message-ID: <4C8E1B06.4070500@redhat.com> Date: Mon, 13 Sep 2010 14:37:26 +0200 From: Michal Novotny User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100430 Fedora/3.0.4-3.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: "Edgar E. Iglesias" Subject: Re: [Qemu-devel] [PATCH] Introduce DPRINTF() macro and convert serial printf() calls to DPRINTF()'s References: <4C8E0883.3060405@redhat.com> <20100913120759.GA28319@edde.se.axis.com> In-Reply-To: <20100913120759.GA28319@edde.se.axis.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: "qemu-devel@nongnu.org" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On 09/13/2010 02:07 PM, Edgar E. Iglesias wrote: > On Mon, Sep 13, 2010 at 01:18:27PM +0200, Michal Novotny wrote: > >> Hi, >> this is the patch to introduce DPRINTF() macro as used in the rest of the >> qemu source files for printing debug messages when the debugging macro is >> set (i.e. the debugging is enabled) - e.g. as used in LSI SCSI controller >> implementation. >> > Hi, > > This patch seems to be corrupt, can you please resubmit with git send-email? > > Thanks, > Edgar > > > Well, I'd love to but I'm having git 1.7.0.1 and it's saying that send-email it doesn't know send-email [1] so I did append it myself. Nevertheless when I did copy & paste of this e-mails body to one file and applied using `cat patchfile | patch -p1` in the current git tree (pulled from upstream repository before issuing the command) it applied fine so I don't know what's wrong. The patch file applicable to latest qemu codebase is attached. Michal [1] This is what I'm having: $ git send-email 0001-dprintf-implementation.patch --to minovotn@redhat.com git: 'send-email' is not a git command. See 'git --help'. $ >> Signed-off-by: Michal Novotny >> --- >> diff --git a/hw/serial.c b/hw/serial.c >> index b66d13a..49431b2 100644 >> --- a/hw/serial.c >> +++ b/hw/serial.c >> @@ -99,6 +99,14 @@ >> #define RECV_FIFO 1 >> #define MAX_XMIT_RETRY 4 >> >> +#ifdef DEBUG_SERIAL >> +#define DPRINTF(fmt, ...) \ >> +do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0); >> +#else >> +#define DPRINTF(fmt, ...) \ >> +do {} while(0); >> +#endif >> + >> typedef struct SerialFIFO { >> uint8_t data[UART_FIFO_LENGTH]; >> uint8_t count; >> @@ -267,10 +275,9 @@ static void serial_update_parameters(SerialState *s) >> ssp.stop_bits = stop_bits; >> s->char_transmit_time = (get_ticks_per_sec() / speed) * frame_size; >> qemu_chr_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS,&ssp); >> -#if 0 >> - printf("speed=%d parity=%c data=%d stop=%d\n", >> + >> + DPRINTF("speed=%d parity=%c data=%d stop=%d\n", >> speed, parity, data_bits, stop_bits); >> -#endif >> } >> >> static void serial_update_msl(SerialState *s) >> @@ -360,9 +367,7 @@ static void serial_ioport_write(void *opaque, >> uint32_t addr, uint32_t val) >> SerialState *s = opaque; >> >> addr&= 7; >> -#ifdef DEBUG_SERIAL >> - printf("serial: write addr=0x%02x val=0x%02x\n", addr, val); >> -#endif >> + DPRINTF("write addr=0x%02x val=0x%02x\n", addr, val); >> switch(addr) { >> default: >> case 0: >> @@ -583,9 +588,7 @@ static uint32_t serial_ioport_read(void *opaque, >> uint32_t addr) >> ret = s->scr; >> break; >> } >> -#ifdef DEBUG_SERIAL >> - printf("serial: read addr=0x%02x val=0x%02x\n", addr, ret); >> -#endif >> + DPRINTF("read addr=0x%02x val=0x%02x\n", addr, ret); >> return ret; >> } >> >> @@ -651,9 +654,7 @@ static void serial_receive1(void *opaque, const >> uint8_t *buf, int size) >> static void serial_event(void *opaque, int event) >> { >> SerialState *s = opaque; >> -#ifdef DEBUG_SERIAL >> - printf("serial: event %x\n", event); >> -#endif >> + DPRINTF("event %x\n", event); >> if (event == CHR_EVENT_BREAK) >> serial_receive_break(s); >> } >> >> -- >> Michal Novotny, RHCE >> Virtualization Team (xen userspace), Red Hat >> >> >> commit 03615a2319e7ef85fc54661493f33c172883cecf Author: Michal Novotny Date: Mon Sep 13 13:36:29 2010 +0200 DPRINTF() impl. diff --git a/hw/serial.c b/hw/serial.c index b66d13a..49431b2 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -99,6 +99,14 @@ #define RECV_FIFO 1 #define MAX_XMIT_RETRY 4 +#ifdef DEBUG_SERIAL +#define DPRINTF(fmt, ...) \ +do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0); +#else +#define DPRINTF(fmt, ...) \ +do {} while(0); +#endif + typedef struct SerialFIFO { uint8_t data[UART_FIFO_LENGTH]; uint8_t count; @@ -267,10 +275,9 @@ static void serial_update_parameters(SerialState *s) ssp.stop_bits = stop_bits; s->char_transmit_time = (get_ticks_per_sec() / speed) * frame_size; qemu_chr_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp); -#if 0 - printf("speed=%d parity=%c data=%d stop=%d\n", + + DPRINTF("speed=%d parity=%c data=%d stop=%d\n", speed, parity, data_bits, stop_bits); -#endif } static void serial_update_msl(SerialState *s) @@ -360,9 +367,7 @@ static void serial_ioport_write(void *opaque, uint32_t addr, uint32_t val) SerialState *s = opaque; addr &= 7; -#ifdef DEBUG_SERIAL - printf("serial: write addr=0x%02x val=0x%02x\n", addr, val); -#endif + DPRINTF("write addr=0x%02x val=0x%02x\n", addr, val); switch(addr) { default: case 0: @@ -583,9 +588,7 @@ static uint32_t serial_ioport_read(void *opaque, uint32_t addr) ret = s->scr; break; } -#ifdef DEBUG_SERIAL - printf("serial: read addr=0x%02x val=0x%02x\n", addr, ret); -#endif + DPRINTF("read addr=0x%02x val=0x%02x\n", addr, ret); return ret; } @@ -651,9 +654,7 @@ static void serial_receive1(void *opaque, const uint8_t *buf, int size) static void serial_event(void *opaque, int event) { SerialState *s = opaque; -#ifdef DEBUG_SERIAL - printf("serial: event %x\n", event); -#endif + DPRINTF("event %x\n", event); if (event == CHR_EVENT_BREAK) serial_receive_break(s); }