ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/display/cirrus_vga: Use qemu_log_mask(ERROR) instead of debug printf 

Replace some debug printf() calls by qemu_log_mask(LOG_GUEST_ERROR).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20200526062252.19852-6-f4bug@amsat.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-05-26 08:22:43 +02:00 committed by Gerd Hoffmann
parent bb6e9e9407
commit 2b55f4d350
1 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
hw/display/cirrus_vga.c
View File

@ -978,9 +978,8 @@ static void cirrus_bitblt_start(CirrusVGAState * s)
s->cirrus_blt_pixelwidth = 4; s->cirrus_blt_pixelwidth = 4;
break; break;
default: default:
#ifdef DEBUG_BITBLT qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: bitblt - pixel width is unknown\n"); "cirrus: bitblt - pixel width is unknown\n");
#endif
goto bitblt_ignore; goto bitblt_ignore;
} }
s->cirrus_blt_mode &= ~CIRRUS_BLTMODE_PIXELWIDTHMASK; s->cirrus_blt_mode &= ~CIRRUS_BLTMODE_PIXELWIDTHMASK;
@ -1037,7 +1036,9 @@ static void cirrus_bitblt_start(CirrusVGAState * s)
} else { } else {
if (s->cirrus_blt_mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) { if (s->cirrus_blt_mode & CIRRUS_BLTMODE_TRANSPARENTCOMP) {
if (s->cirrus_blt_pixelwidth > 2) { if (s->cirrus_blt_pixelwidth > 2) {
printf("src transparent without colorexpand must be 8bpp or 16bpp\n"); qemu_log_mask(LOG_GUEST_ERROR,
"cirrus: src transparent without colorexpand "
"must be 8bpp or 16bpp\n");
goto bitblt_ignore; goto bitblt_ignore;
} }
if (s->cirrus_blt_mode & CIRRUS_BLTMODE_BACKWARDS) { if (s->cirrus_blt_mode & CIRRUS_BLTMODE_BACKWARDS) {
@ -1135,10 +1136,9 @@ static uint32_t cirrus_get_bpp16_depth(CirrusVGAState * s)
ret = 16; ret = 16;
break; /* XGA HiColor */ break; /* XGA HiColor */
default: default:
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: invalid DAC value %x in 16bpp\n", "cirrus: invalid DAC value 0x%x in 16bpp\n",
(s->cirrus_hidden_dac_data & 0xf)); (s->cirrus_hidden_dac_data & 0xf));
#endif
ret = 15; /* XXX */ ret = 15; /* XXX */
break; break;
} }
@ -1307,11 +1307,9 @@ static int cirrus_vga_read_sr(CirrusVGAState * s)
#endif #endif
return s->vga.sr[s->vga.sr_index]; return s->vga.sr[s->vga.sr_index];
default: default:
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: inport sr_index %02x\n", s->vga.sr_index); "cirrus: inport sr_index 0x%02x\n", s->vga.sr_index);
#endif
return 0xff; return 0xff;
break;
} }
} }
@ -1400,10 +1398,9 @@ static void cirrus_vga_write_sr(CirrusVGAState * s, uint32_t val)
cirrus_update_memory_access(s); cirrus_update_memory_access(s);
break; break;
default: default:
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: outport sr_index %02x, sr_value %02x\n", "cirrus: outport sr_index 0x%02x, sr_value 0x%02x\n",
s->vga.sr_index, val); s->vga.sr_index, val);
#endif
break; break;
} }
} }
@ -1501,9 +1498,8 @@ static int cirrus_vga_read_gr(CirrusVGAState * s, unsigned reg_index)
if (reg_index < 0x3a) { if (reg_index < 0x3a) {
return s->vga.gr[reg_index]; return s->vga.gr[reg_index];
} else { } else {
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: inport gr_index %02x\n", reg_index); "cirrus: inport gr_index 0x%02x\n", reg_index);
#endif
return 0xff; return 0xff;
} }
} }
@ -1590,10 +1586,9 @@ cirrus_vga_write_gr(CirrusVGAState * s, unsigned reg_index, int reg_value)
cirrus_write_bitblt(s, reg_value); cirrus_write_bitblt(s, reg_value);
break; break;
default: default:
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: outport gr_index %02x, gr_value %02x\n", reg_index, "cirrus: outport gr_index 0x%02x, gr_value 0x%02x\n",
reg_value); reg_index, reg_value);
#endif
break; break;
} }
} }
@ -1648,9 +1643,8 @@ static int cirrus_vga_read_cr(CirrusVGAState * s, unsigned reg_index)
return s->vga.ar_index & 0x3f; return s->vga.ar_index & 0x3f;
break; break;
default: default:
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: inport cr_index %02x\n", reg_index); "cirrus: inport cr_index 0x%02x\n", reg_index);
#endif
return 0xff; return 0xff;
} }
} }
@ -1721,10 +1715,9 @@ static void cirrus_vga_write_cr(CirrusVGAState * s, int reg_value)
break; break;
case 0x25: // Part Status case 0x25: // Part Status
default: default:
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: outport cr_index %02x, cr_value %02x\n", "cirrus: outport cr_index 0x%02x, cr_value 0x%02x\n",
s->vga.cr_index, reg_value); s->vga.cr_index, reg_value);
#endif
break; break;
} }
} }
@ -1834,9 +1827,8 @@ static uint8_t cirrus_mmio_blt_read(CirrusVGAState * s, unsigned address)
value = cirrus_vga_read_gr(s, 0x31); value = cirrus_vga_read_gr(s, 0x31);
break; break;
default: default:
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: mmio read - address 0x%04x\n", address); "cirrus: mmio read - address 0x%04x\n", address);
#endif
break; break;
} }
@ -1946,10 +1938,9 @@ static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address,
cirrus_vga_write_gr(s, 0x31, value); cirrus_vga_write_gr(s, 0x31, value);
break; break;
default: default:
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: mmio write - addr 0x%04x val 0x%02x (ignored)\n", "cirrus: mmio write - addr 0x%04x val 0x%02x (ignored)\n",
address, value); address, value);
#endif
break; break;
} }
} }
@ -2047,9 +2038,8 @@ static uint64_t cirrus_vga_mem_read(void *opaque,
} }
} else { } else {
val = 0xff; val = 0xff;
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: mem_readb " TARGET_FMT_plx "\n", addr); "cirrus: mem_readb 0x" TARGET_FMT_plx "\n", addr);
#endif
} }
return val; return val;
} }
@ -2112,10 +2102,9 @@ static void cirrus_vga_mem_write(void *opaque,
cirrus_mmio_blt_write(s, addr & 0xff, mem_value); cirrus_mmio_blt_write(s, addr & 0xff, mem_value);
} }
} else { } else {
#ifdef DEBUG_CIRRUS qemu_log_mask(LOG_GUEST_ERROR,
printf("cirrus: mem_writeb " TARGET_FMT_plx " value 0x%02" PRIu64 "\n", addr, "cirrus: mem_writeb 0x" TARGET_FMT_plx " "
mem_value); "value 0x%02" PRIu64 "\n", addr, mem_value);
#endif
} }
} }