Trivial patches
cover Trivial patches
My trivial patches from during the freeze.
Peter Crosthwaite (4):
pflash_cfi01: qemu_log_mask "unimplemented" msg
pflash_cfi0x: Send debug messages to stderr
zynq_slcr: Compile time warning fixes.
arm_gic: Add cpu nr to Raised IRQ message
hw/arm_gic.c | 2 +- hw/pflash_cfi01.c | 14 +++++++------- hw/pflash_cfi02.c | 6 +++--- hw/zynq_slcr.c | 7 ++++--- 4 files changed, 15 insertions(+), 14 deletions(-)
PATCH 1/4 pflash_cfi01: qemu_log_mask "unimplemented" msg
This printf is informing the user of unimplemented functionality. It should be re-directed to qemu_log(LOG_UNIMP, ...) accordingly.
---
hw/pflash_cfi01.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
hw/pflash_cfi01.c +3 -3
@@ -438,9 +438,9 @@ static void pflash_write(pflash_t *pfl, hwaddr offset,return ; error_flash: -printf ("%s: Unimplemented flash cmd sequence " -"(offset " TARGET_FMT_plx", wcycle 0x%x cmd 0x%x value 0x%x)\n" , - __func__, offset, pfl->wcycle, pfl->cmd, value); +qemu_log_mask (LOG_UNIMP ,"%s: Unimplemented flash cmd sequence " +"(offset " TARGET_FMT_plx", wcycle 0x%x cmd 0x%x value 0x%x)" +"\n" , __func__, offset, pfl->wcycle, pfl->cmd, value); reset_flash:memory_region_rom_device_set_readable (&pfl->mem, true);
Signature · 1 line
1.7.0.4
Re: [Qemu-devel] [PATCH v1 1/4] pflash_cfi01: qemu_log_mask "unimplemented" msg
Quoted 4 lines · Peter Crosthwaite
This printf is informing the user of unimplemented functionality. It should be re-directed to
qemu_log(LOG_UNIMP, ...)accordingly.Signed-off-by Peter Crosthwaite <[email protected]>
I'm going to assume this series will go through -trivial rather than arm-devs.
-- PMM
PATCH 2/4 pflash_cfi0x: Send debug messages to stderr
In reply to Peter CrosthwaiteThese debug info messages should go to stderr rather than stdout.
---
hw/pflash_cfi01.c | 8 ++++---- hw/pflash_cfi02.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
hw/pflash_cfi01.c +4 -4
@@ -46,15 +46,15 @@#define PFLASH_BUG (fmt, ...) \ do { \ - printf("PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ + fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ exit(1); \ } while(0)/* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG -#define DPRINTF (fmt, ...) \ -do { \ - printf("PFLASH: " fmt , ## __VA_ARGS__); \ +#define DPRINTF (fmt, ...) \ +do { \ + fprintf(stderr, "PFLASH: " fmt , ## __VA_ARGS__); \ } while (0)#else #define DPRINTF (fmt, ...) do { } while (0)
hw/pflash_cfi02.c +3 -3
@@ -45,9 +45,9 @@//#define PFLASH_DEBUG #ifdef PFLASH_DEBUG -#define DPRINTF (fmt, ...) \ -do { \ - printf("PFLASH: " fmt , ## __VA_ARGS__); \ +#define DPRINTF (fmt, ...) \ +do { \ + fprintf(stderr "PFLASH: " fmt , ## __VA_ARGS__); \ } while (0)#else #define DPRINTF (fmt, ...) do { } while (0)
Signature · 1 line
1.7.0.4
Re: [Qemu-devel] [PATCH v1 2/4] pflash_cfi0x: Send debug messages to stderr
Quoted 3 lines · Peter Crosthwaite
These debug info messages should go to stderr rather than stdout.
Signed-off-by Peter Crosthwaite <[email protected]>
-- PMM
PATCH 3/4 zynq_slcr: Compile time warning fixes.
In reply to Peter CrosthwaiteFew warnings when compiled with debug printfs enabled. Fixed all.
---
hw/zynq_slcr.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
hw/zynq_slcr.c +4 -3
@@ -334,7 +334,7 @@ static uint64_t zynq_slcr_read(void *opaque, hwaddr offset, {uint32_t ret =zynq_slcr_read_imp (opaque, offset); -DB_PRINT ("addr: %08x data: %08x\n" , offset, ret); +DB_PRINT ("addr: %08x data: %08x\n" , (unsigned )offset, (unsigned )ret);return ret; }
@@ -343,7 +343,7 @@ static void zynq_slcr_write(void *opaque, hwaddr offset, {ZynqSLCRState *s = (ZynqSLCRState *)opaque; -DB_PRINT ("offset: %08x data: %08x\n" , offset, (unsigned )val); +DB_PRINT ("offset: %08x data: %08x\n" , (unsigned )offset, (unsigned )val);switch (offset) {case 0x00 :/* SCL */
@@ -476,7 +476,8 @@ static void zynq_slcr_write(void *opaque, hwaddr offset,break ;default : bad_reg: -DB_PRINT ("Bad register write %x <= %08x\n" , (int )offset, val); +DB_PRINT ("Bad register write %x <= %08x\n" , (int )offset, + (unsigned )val); } }else {DB_PRINT ("SCLR registers are locked. Unlock them first\n" );
Signature · 1 line
1.7.0.4
Re: [Qemu-devel] [PATCH v1 3/4] zynq_slcr: Compile time warning fixes.
Quoted 3 lines · Peter Crosthwaite
Few warnings when compiled with debug printfs enabled. Fixed all.
Signed-off-by Peter Crosthwaite <[email protected]>
-- PMM
PATCH 4/4 arm_gic: Add cpu nr to Raised IRQ message
In reply to Peter CrosthwaiteAdd the relevant CPU nr to this debug message to make IRQ debugging more informative.
---
hw/arm_gic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
hw/arm_gic.c +1 -1
@@ -76,7 +76,7 @@ void gic_update(GICState *s)if (best_prio <= s->priority_mask[cpu]) { s->current_pending[cpu] = best_irq;if (best_prio < s->running_priority[cpu]) { -DPRINTF ("Raised pending IRQ %d\n" , best_irq); +DPRINTF ("Raised pending IRQ %d (cpu %d)\n" , best_irq, cpu); level =1 ; } }
Signature · 1 line
1.7.0.4
Re: [Qemu-devel] [PATCH v1 4/4] arm_gic: Add cpu nr to Raised IRQ message
Quoted 4 lines · Peter Crosthwaite
Add the relevant CPU nr to this debug message to make IRQ debugging more informative.
Signed-off-by Peter Crosthwaite <[email protected]>
-- PMM
Stefan Hajnoczi
AppliedQuoted 8 lines · Peter Crosthwaite
My trivial patches from during the freeze.
Peter Crosthwaite (4):
pflash_cfi01:qemu_log_mask"unimplemented" msg
pflash_cfi0x: Send debug messages to stderr
zynq_slcr: Compile time warning fixes.
arm_gic: Add cpu nr to Raised IRQ message
Quoted 7 lines
hw/arm_gic.c | 2 +- hw/pflash_cfi01.c | 14 +++++++------- hw/pflash_cfi02.c | 6 +++--- hw/zynq_slcr.c | 7 ++++--- 4 files changed, 15 insertions(+), 14 deletions(-)
Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches
Stefan