Skip to contentSkip to conversation

hw/net/pcnet: Use qemu_log_mask(GUEST_ERROR) instead of fprintf

PATCH Applied Philippe Mathieu-Daudé 3 participants 4 messages Mar 11, 2019 – Apr 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/net/pcnet: Use qemu_log_mask(GUEST_ERROR) instead of fprintf

Avoid to clutter stdout until explicitly requested (with -d guest_errors):

  $ qemu-system-mips -M malta -m 512 -kernel vmlinux-3.2.0-4-4kc-malta
  Bad SWSTYLE=0x04

---
Helge patch "pcnet: Avoid warning when switching back to 16bit mode" remembered me I had this one somewhere.

---
 hw/net/pcnet.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/net/pcnet.c +3 -1
index d9ba04bdfc..16683091c9 100644
@@ -36,6 +36,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/log.h"
 #include "hw/qdev.h"
 #include "net/net.h"
 #include "net/eth.h"
@@ -1501,7 +1502,8 @@ static void pcnet_bcr_writew(PCNetState *s, uint32_t rap, uint32_t val)
             val |= 0x0300;
             break;
         default:
-            printf("Bad SWSTYLE=0x%02x\n", val & 0xff);
+            qemu_log_mask(LOG_GUEST_ERROR, "pcnet: Bad SWSTYLE=0x%02x\n",
+                          val & 0xff);
             val = 0x0200;
             break;
         }
Signature · 1 line
2.20.1
#1 lore raw

Oops 'fprintf' -> 'printf' in patch subject.

Quoted 37 lines · Philippe Mathieu-Daudé

Avoid to clutter stdout until explicitly requested (with -d guest_errors):

  $ qemu-system-mips -M malta -m 512 -kernel vmlinux-3.2.0-4-4kc-malta
  Bad SWSTYLE=0x04

---
Helge patch "pcnet: Avoid warning when switching back to 16bit mode" remembered me I had this one somewhere.

---
 hw/net/pcnet.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/net/pcnet.c +3 -1
index d9ba04bdfc..16683091c9 100644
@@ -36,6 +36,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/log.h"
 #include "hw/qdev.h"
 #include "net/net.h"
 #include "net/eth.h"
@@ -1501,7 +1502,8 @@ static void pcnet_bcr_writew(PCNetState *s, uint32_t rap, uint32_t val)
             val |= 0x0300;
             break;
         default:
-            printf("Bad SWSTYLE=0x%02x\n", val & 0xff);
+            qemu_log_mask(LOG_GUEST_ERROR, "pcnet: Bad SWSTYLE=0x%02x\n",
+                          val & 0xff);
             val = 0x0200;
             break;
         }
Reviewed-by on v1 1/1
#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 28 lines · Philippe Mathieu-Daudé

Avoid to clutter stdout until explicitly requested (with -d guest_errors):

  $ qemu-system-mips -M malta -m 512 -kernel vmlinux-3.2.0-4-4kc-malta
  Bad SWSTYLE=0x04

---
Helge patch "pcnet: Avoid warning when switching back to 16bit mode" remembered me I had this one somewhere.

---
 hw/net/pcnet.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/net/pcnet.c +1 -0
index d9ba04bdfc..16683091c9 100644
@@ -36,6 +36,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/log.h"
 #include "hw/qdev.h"
 #include "net/net.h"
 #include "net/eth.h"

hw/net/pcnet.c static void pcnet_bcr_writew(PCNetState *s, uint32_t rap, uint32_t val) · line 1509

Quoted 9 lines
hw/net/pcnet.c +2 -1
@@ -1501,7 +1502,8 @@ static void pcnet_bcr_writew(PCNetState *s, uint32_t rap, uint32_t val)
             val |= 0x0300;
             break;
         default:
-            printf("Bad SWSTYLE=0x%02x\n", val & 0xff);
+            qemu_log_mask(LOG_GUEST_ERROR, "pcnet: Bad SWSTYLE=0x%02x\n",
+                          val & 0xff);
             val = 0x0200;
             break;
         }
#3 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 28 lines · Philippe Mathieu-Daudé

Avoid to clutter stdout until explicitly requested (with -d guest_errors):

  $ qemu-system-mips -M malta -m 512 -kernel vmlinux-3.2.0-4-4kc-malta
  Bad SWSTYLE=0x04

---
Helge patch "pcnet: Avoid warning when switching back to 16bit mode" remembered me I had this one somewhere.

---
 hw/net/pcnet.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/net/pcnet.c +1 -0
index d9ba04bdfc..16683091c9 100644
@@ -36,6 +36,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/log.h"
 #include "hw/qdev.h"
 #include "net/net.h"
 #include "net/eth.h"

hw/net/pcnet.c static void pcnet_bcr_writew(PCNetState *s, uint32_t rap, uint32_t val) · line 1509

Quoted 9 lines
hw/net/pcnet.c +2 -1
@@ -1501,7 +1502,8 @@ static void pcnet_bcr_writew(PCNetState *s, uint32_t rap, uint32_t val)
             val |= 0x0300;
             break;
         default:
-            printf("Bad SWSTYLE=0x%02x\n", val & 0xff);
+            qemu_log_mask(LOG_GUEST_ERROR, "pcnet: Bad SWSTYLE=0x%02x\n",
+                          val & 0xff);
             val = 0x0200;
             break;
         }

Applied to my trivial-patches branch.

Thanks,
Laurent