david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/vmware_vga.c: add tracepoints for mmio reads+writes

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2013-03-25 09:53:35 +01:00
parent 17866fc888
commit 7a6404cd8b
2 changed files with 86 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
hw/display/vmware_vga.c
View File

@ -721,61 +721,79 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address)
uint32_t caps; uint32_t caps;
struct vmsvga_state_s *s = opaque; struct vmsvga_state_s *s = opaque;
DisplaySurface *surface = qemu_console_surface(s->vga.con); DisplaySurface *surface = qemu_console_surface(s->vga.con);
uint32_t ret;
switch (s->index) { switch (s->index) {
case SVGA_REG_ID: case SVGA_REG_ID:
return s->svgaid; ret = s->svgaid;
break;
case SVGA_REG_ENABLE: case SVGA_REG_ENABLE:
return s->enable; ret = s->enable;
break;
case SVGA_REG_WIDTH: case SVGA_REG_WIDTH:
return surface_width(surface); ret = surface_width(surface);
break;
case SVGA_REG_HEIGHT: case SVGA_REG_HEIGHT:
return surface_height(surface); ret = surface_height(surface);
break;
case SVGA_REG_MAX_WIDTH: case SVGA_REG_MAX_WIDTH:
return SVGA_MAX_WIDTH; ret = SVGA_MAX_WIDTH;
break;
case SVGA_REG_MAX_HEIGHT: case SVGA_REG_MAX_HEIGHT:
return SVGA_MAX_HEIGHT; ret = SVGA_MAX_HEIGHT;
break;
case SVGA_REG_DEPTH: case SVGA_REG_DEPTH:
return s->depth; ret = s->depth;
break;
case SVGA_REG_BITS_PER_PIXEL: case SVGA_REG_BITS_PER_PIXEL:
return (s->depth + 7) & ~7; ret = (s->depth + 7) & ~7;
break;
case SVGA_REG_PSEUDOCOLOR: case SVGA_REG_PSEUDOCOLOR:
return 0x0; ret = 0x0;
break;
case SVGA_REG_RED_MASK: case SVGA_REG_RED_MASK:
return surface->pf.rmask; ret = surface->pf.rmask;
break;
case SVGA_REG_GREEN_MASK: case SVGA_REG_GREEN_MASK:
return surface->pf.gmask; ret = surface->pf.gmask;
break;
case SVGA_REG_BLUE_MASK: case SVGA_REG_BLUE_MASK:
return surface->pf.bmask; ret = surface->pf.bmask;
break;
case SVGA_REG_BYTES_PER_LINE: case SVGA_REG_BYTES_PER_LINE:
return s->bypp * s->new_width; ret = s->bypp * s->new_width;
break;
case SVGA_REG_FB_START: { case SVGA_REG_FB_START: {
struct pci_vmsvga_state_s *pci_vmsvga struct pci_vmsvga_state_s *pci_vmsvga
= container_of(s, struct pci_vmsvga_state_s, chip); = container_of(s, struct pci_vmsvga_state_s, chip);
return pci_get_bar_addr(&pci_vmsvga->card, 1); ret = pci_get_bar_addr(&pci_vmsvga->card, 1);
break;
} }
case SVGA_REG_FB_OFFSET: case SVGA_REG_FB_OFFSET:
return 0x0; ret = 0x0;
break;
case SVGA_REG_VRAM_SIZE: case SVGA_REG_VRAM_SIZE:
return s->vga.vram_size; /* No physical VRAM besides the framebuffer */ ret = s->vga.vram_size; /* No physical VRAM besides the framebuffer */
break;
case SVGA_REG_FB_SIZE: case SVGA_REG_FB_SIZE:
return s->vga.vram_size; ret = s->vga.vram_size;
break;
case SVGA_REG_CAPABILITIES: case SVGA_REG_CAPABILITIES:
caps = SVGA_CAP_NONE; caps = SVGA_CAP_NONE;
@ -791,66 +809,96 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address)
SVGA_CAP_CURSOR_BYPASS; SVGA_CAP_CURSOR_BYPASS;
} }
#endif #endif
return caps; ret = caps;
break;
case SVGA_REG_MEM_START: { case SVGA_REG_MEM_START: {
struct pci_vmsvga_state_s *pci_vmsvga struct pci_vmsvga_state_s *pci_vmsvga
= container_of(s, struct pci_vmsvga_state_s, chip); = container_of(s, struct pci_vmsvga_state_s, chip);
return pci_get_bar_addr(&pci_vmsvga->card, 2); ret = pci_get_bar_addr(&pci_vmsvga->card, 2);
break;
} }
case SVGA_REG_MEM_SIZE: case SVGA_REG_MEM_SIZE:
return s->fifo_size; ret = s->fifo_size;
break;
case SVGA_REG_CONFIG_DONE: case SVGA_REG_CONFIG_DONE:
return s->config; ret = s->config;
break;
case SVGA_REG_SYNC: case SVGA_REG_SYNC:
case SVGA_REG_BUSY: case SVGA_REG_BUSY:
return s->syncing; ret = s->syncing;
break;
case SVGA_REG_GUEST_ID: case SVGA_REG_GUEST_ID:
return s->guest; ret = s->guest;
break;
case SVGA_REG_CURSOR_ID: case SVGA_REG_CURSOR_ID:
return s->cursor.id; ret = s->cursor.id;
break;
case SVGA_REG_CURSOR_X: case SVGA_REG_CURSOR_X:
return s->cursor.x; ret = s->cursor.x;
break;
case SVGA_REG_CURSOR_Y: case SVGA_REG_CURSOR_Y:
return s->cursor.x; ret = s->cursor.x;
break;
case SVGA_REG_CURSOR_ON: case SVGA_REG_CURSOR_ON:
return s->cursor.on; ret = s->cursor.on;
break;
case SVGA_REG_HOST_BITS_PER_PIXEL: case SVGA_REG_HOST_BITS_PER_PIXEL:
return (s->depth + 7) & ~7; ret = (s->depth + 7) & ~7;
break;
case SVGA_REG_SCRATCH_SIZE: case SVGA_REG_SCRATCH_SIZE:
return s->scratch_size; ret = s->scratch_size;
break;
case SVGA_REG_MEM_REGS: case SVGA_REG_MEM_REGS:
case SVGA_REG_NUM_DISPLAYS: case SVGA_REG_NUM_DISPLAYS:
case SVGA_REG_PITCHLOCK: case SVGA_REG_PITCHLOCK:
case SVGA_PALETTE_BASE ... SVGA_PALETTE_END: case SVGA_PALETTE_BASE ... SVGA_PALETTE_END:
return 0; ret = 0;
break;
default: default:
if (s->index >= SVGA_SCRATCH_BASE && if (s->index >= SVGA_SCRATCH_BASE &&
s->index < SVGA_SCRATCH_BASE + s->scratch_size) { s->index < SVGA_SCRATCH_BASE + s->scratch_size) {
return s->scratch[s->index - SVGA_SCRATCH_BASE]; ret = s->scratch[s->index - SVGA_SCRATCH_BASE];
break;
} }
printf("%s: Bad register %02x\n", __func__, s->index); printf("%s: Bad register %02x\n", __func__, s->index);
ret = 0;
break;
} }
return 0; if (s->index >= SVGA_SCRATCH_BASE) {
trace_vmware_scratch_read(s->index, ret);
} else if (s->index >= SVGA_PALETTE_BASE) {
trace_vmware_palette_read(s->index, ret);
} else {
trace_vmware_value_read(s->index, ret);
}
return ret;
} }
static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value)
{ {
struct vmsvga_state_s *s = opaque; struct vmsvga_state_s *s = opaque;
if (s->index >= SVGA_SCRATCH_BASE) {
trace_vmware_scratch_write(s->index, value);
} else if (s->index >= SVGA_PALETTE_BASE) {
trace_vmware_palette_write(s->index, value);
} else {
trace_vmware_value_write(s->index, value);
}
switch (s->index) { switch (s->index) {
case SVGA_REG_ID: case SVGA_REG_ID:
if (value == SVGA_ID_2 || value == SVGA_ID_1 || value == SVGA_ID_0) { if (value == SVGA_ID_2 || value == SVGA_ID_1 || value == SVGA_ID_0) {

6
trace-events
View File

@ -970,6 +970,12 @@ displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]"
# vga.c # vga.c
ppm_save(const char *filename, void *display_surface) "%s surface=%p" ppm_save(const char *filename, void *display_surface) "%s surface=%p"
vmware_value_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
vmware_value_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
vmware_palette_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
vmware_palette_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
vmware_scratch_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
vmware_scratch_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
# savevm.c # savevm.c