[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH V12 24/27] pm_smbus: remove #ifdef DEBUG.
From: |
Igor Kovalenko |
Subject: |
Re: [Qemu-devel] [PATCH V12 24/27] pm_smbus: remove #ifdef DEBUG. |
Date: |
Thu, 7 Jan 2010 03:05:41 +0300 |
On Thu, Jan 7, 2010 at 2:51 AM, Isaku Yamahata <address@hidden> wrote:
> On Wed, Jan 06, 2010 at 12:42:28PM +0100, Stefan Weil wrote:
>> Isaku Yamahata schrieb:
>> > remove #ifdef DEBUG by using macro.
>> >
>> > Signed-off-by: Isaku Yamahata <address@hidden>
>> > Acked-by: Gerd Hoffmann <address@hidden>
>> > ---
>> > hw/pm_smbus.c | 21 ++++++++++++---------
>> > 1 files changed, 12 insertions(+), 9 deletions(-)
>> >
>> > diff --git a/hw/pm_smbus.c b/hw/pm_smbus.c
>> > index 6ef6b9e..9929d72 100644
>> > --- a/hw/pm_smbus.c
>> > +++ b/hw/pm_smbus.c
>> > @@ -37,6 +37,15 @@
>> > #define SMBHSTDAT1 0x06
>> > #define SMBBLKDAT 0x07
>> >
>> > +//#define DEBUG
>> > +
>> > +#ifdef DEBUG
>> > +# define SMBUS_DPRINTF(format, ...) printf(format, ## __VA_ARGS__)
>>
>> Debug output should go to stderr. So this would be even better:
>>
>> +# define SMBUS_DPRINTF(format, ...) fprintf(stderr, format, ## __VA_ARGS__)
>>
>
> Yes, in general.
> However the original code sends debug output to stdout and
> Most of debug output goes to stdout than stderr. You can easily
> see it by greping with DEBUG.
>
> So at this time, I'd like to send debug output to stdout.
> (And hopefully later create a framework and make debug output go
> to stderr consistently over sources.)
Maybe logfile redirection would do as well, with a few changes to
logfile handling.
Default may be stderr or stdout (with appropriate command line switch)
This way you can do debug output to logfile always. The following
changes sets default to stdout always and prevents errors while
reopening logfile.
diff --git a/vl.c b/vl.c
index e881e45..63c199c 100644
--- a/vl.c
+++ b/vl.c
@@ -4878,6 +4878,9 @@ int main(int argc, char **argv, char **envp)
CPUState *env;
int show_vnc_port = 0;
+ /* Prevent unfortunate early crash with debugging fprintf */
+ logfile=stdout;
+
init_clocks();
qemu_errors_to_file(stderr);
l
diff --git a/exec.c b/exec.c
index 2b068f5..752e208 100644
--- a/exec.c
+++ b/exec.c
@@ -1494,7 +1494,7 @@ void cpu_single_step(CPUState *env, int enabled)
void cpu_set_log(int log_flags)
{
loglevel = log_flags;
- if (loglevel && !logfile) {
+ if (loglevel && (!logfile || logfile == stdout)) {
logfile = fopen(logfilename, log_append ? "a" : "w");
if (!logfile) {
perror(logfilename);
@@ -1521,7 +1521,7 @@ void cpu_set_log(int log_flags)
void cpu_set_log_filename(const char *filename)
{
logfilename = strdup(filename);
- if (logfile) {
+ if (logfile && logfile != stdout) {
fclose(logfile);
logfile = NULL;
}
--
Kind regards,
Igor V. Kovalenko
- [Qemu-devel] [PATCH V12 00/27] split out piix specific part from pc emulator and some clean ups, Isaku Yamahata, 2010/01/05
- [Qemu-devel] [PATCH V12 23/27] pci hotadd, acpi_piix4: remove global variables., Isaku Yamahata, 2010/01/05
- [Qemu-devel] [PATCH V12 11/27] pc: introduce a function to allocate cpu irq., Isaku Yamahata, 2010/01/05
- [Qemu-devel] [PATCH V12 09/27] pc: remove a global variable, floppy_controller., Isaku Yamahata, 2010/01/05
- [Qemu-devel] [PATCH V12 25/27] acpi_piix4: remove #ifdef DEBUG., Isaku Yamahata, 2010/01/05
- [Qemu-devel] [PATCH V12 01/27] acpi: split out piix4 smbus routines from acpi.c into pm_smbus.c, Isaku Yamahata, 2010/01/05
- [Qemu-devel] [PATCH V12 05/27] acpi_piix4: remove unused variable in get_pmsts()., Isaku Yamahata, 2010/01/05
- [Qemu-devel] [PATCH V12 27/27] mc146818rtc: remove #ifdef DEBUG_CMOS., Isaku Yamahata, 2010/01/05
- [Qemu-devel] [PATCH V12 12/27] pc: make pc_init1() not refer ferr_irq directly., Isaku Yamahata, 2010/01/05
- [Qemu-devel] [PATCH V12 08/27] pc: make an unnecessary global variable, pit, local., Isaku Yamahata, 2010/01/05