| Message ID | 20200526062252.19852-11-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/display: Omnibus cleanups | expand |
On Mon, May 25, 2020 at 11:32 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Avoid flooding stdio by converting printf() calls to > qemu_log_mask(GUEST_ERROR), which are disabled by default. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/display/vmware_vga.c | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c > index 58ea82e3e5..5c0fc49d9d 100644 > --- a/hw/display/vmware_vga.c > +++ b/hw/display/vmware_vga.c > @@ -26,6 +26,7 @@ > #include "qemu/module.h" > #include "qemu/units.h" > #include "qapi/error.h" > +#include "qemu/log.h" > #include "hw/loader.h" > #include "trace.h" > #include "ui/vnc.h" > @@ -953,7 +954,8 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address) > ret = s->scratch[s->index - SVGA_SCRATCH_BASE]; > break; > } > - printf("%s: Bad register %02x\n", __func__, s->index); > + qemu_log_mask(LOG_GUEST_ERROR, > + "%s: Bad register %02x\n", __func__, s->index); > ret = 0; > break; > } > @@ -1002,7 +1004,8 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) > s->new_width = value; > s->invalidated = 1; > } else { > - printf("%s: Bad width: %i\n", __func__, value); > + qemu_log_mask(LOG_GUEST_ERROR, > + "%s: Bad width: %i\n", __func__, value); > } > break; > > @@ -1011,13 +1014,15 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) > s->new_height = value; > s->invalidated = 1; > } else { > - printf("%s: Bad height: %i\n", __func__, value); > + qemu_log_mask(LOG_GUEST_ERROR, > + "%s: Bad height: %i\n", __func__, value); > } > break; > > case SVGA_REG_BITS_PER_PIXEL: > if (value != 32) { > - printf("%s: Bad bits per pixel: %i bits\n", __func__, value); > + qemu_log_mask(LOG_GUEST_ERROR, > + "%s: Bad bits per pixel: %i bits\n", __func__, value); > s->config = 0; > s->invalidated = 1; > } > @@ -1082,7 +1087,8 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) > s->scratch[s->index - SVGA_SCRATCH_BASE] = value; > break; > } > - printf("%s: Bad register %02x\n", __func__, s->index); > + qemu_log_mask(LOG_GUEST_ERROR, > + "%s: Bad register %02x\n", __func__, s->index); > } > } > > -- > 2.21.3 > >
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 58ea82e3e5..5c0fc49d9d 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -26,6 +26,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" +#include "qemu/log.h" #include "hw/loader.h" #include "trace.h" #include "ui/vnc.h" @@ -953,7 +954,8 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address) ret = s->scratch[s->index - SVGA_SCRATCH_BASE]; break; } - printf("%s: Bad register %02x\n", __func__, s->index); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Bad register %02x\n", __func__, s->index); ret = 0; break; } @@ -1002,7 +1004,8 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) s->new_width = value; s->invalidated = 1; } else { - printf("%s: Bad width: %i\n", __func__, value); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Bad width: %i\n", __func__, value); } break; @@ -1011,13 +1014,15 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) s->new_height = value; s->invalidated = 1; } else { - printf("%s: Bad height: %i\n", __func__, value); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Bad height: %i\n", __func__, value); } break; case SVGA_REG_BITS_PER_PIXEL: if (value != 32) { - printf("%s: Bad bits per pixel: %i bits\n", __func__, value); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Bad bits per pixel: %i bits\n", __func__, value); s->config = 0; s->invalidated = 1; } @@ -1082,7 +1087,8 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) s->scratch[s->index - SVGA_SCRATCH_BASE] = value; break; } - printf("%s: Bad register %02x\n", __func__, s->index); + qemu_log_mask(LOG_GUEST_ERROR, + "%s: Bad register %02x\n", __func__, s->index); } }
Avoid flooding stdio by converting printf() calls to qemu_log_mask(GUEST_ERROR), which are disabled by default. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/display/vmware_vga.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)