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

trace: Trace virtqueue operations 

This patch adds trace events for virtqueue operations including
adding/removing buffers, notifying the guest, and receiving a notify
from the guest.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Stefan Hajnoczi 2010-05-24 13:19:21 +01:00 committed by Anthony Liguori
parent 6d519a5f95
commit 64979a4d61
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/virtio.c
View File

@ -13,6 +13,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "trace.h"
#include "virtio.h" #include "virtio.h"
#include "sysemu.h" #include "sysemu.h"
@ -205,6 +206,8 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int offset; unsigned int offset;
int i; int i;
trace_virtqueue_fill(vq, elem, len, idx);
offset = 0; offset = 0;
for (i = 0; i < elem->in_num; i++) { for (i = 0; i < elem->in_num; i++) {
size_t size = MIN(len - offset, elem->in_sg[i].iov_len); size_t size = MIN(len - offset, elem->in_sg[i].iov_len);
@ -232,6 +235,7 @@ void virtqueue_flush(VirtQueue *vq, unsigned int count)
{ {
/* Make sure buffer is written before we update index. */ /* Make sure buffer is written before we update index. */
wmb(); wmb();
trace_virtqueue_flush(vq, count);
vring_used_idx_increment(vq, count); vring_used_idx_increment(vq, count);
vq->inuse -= count; vq->inuse -= count;
} }
@ -432,6 +436,7 @@ int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem)
vq->inuse++; vq->inuse++;
trace_virtqueue_pop(vq, elem, elem->in_num, elem->out_num);
return elem->in_num + elem->out_num; return elem->in_num + elem->out_num;
} }
@ -570,6 +575,7 @@ int virtio_queue_get_num(VirtIODevice *vdev, int n)
void virtio_queue_notify(VirtIODevice *vdev, int n) void virtio_queue_notify(VirtIODevice *vdev, int n)
{ {
if (n < VIRTIO_PCI_QUEUE_MAX && vdev->vq[n].vring.desc) { if (n < VIRTIO_PCI_QUEUE_MAX && vdev->vq[n].vring.desc) {
trace_virtio_queue_notify(vdev, n, &vdev->vq[n]);
vdev->vq[n].handle_output(vdev, &vdev->vq[n]); vdev->vq[n].handle_output(vdev, &vdev->vq[n]);
} }
} }
@ -607,6 +613,7 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
void virtio_irq(VirtQueue *vq) void virtio_irq(VirtQueue *vq)
{ {
trace_virtio_irq(vq);
vq->vdev->isr |= 0x01; vq->vdev->isr |= 0x01;
virtio_notify_vector(vq->vdev, vq->vector); virtio_notify_vector(vq->vdev, vq->vector);
} }
@ -619,6 +626,7 @@ void virtio_notify(VirtIODevice *vdev, VirtQueue *vq)
(vq->inuse || vring_avail_idx(vq) != vq->last_avail_idx))) (vq->inuse || vring_avail_idx(vq) != vq->last_avail_idx)))
return; return;
trace_virtio_notify(vdev, vq);
vdev->isr |= 0x01; vdev->isr |= 0x01;
virtio_notify_vector(vdev, vq->vector); virtio_notify_vector(vdev, vq->vector);
} }

8
trace-events
View File

@ -38,6 +38,14 @@ disable qemu_memalign(size_t alignment, size_t size, void *ptr) "alignment %zu s
disable qemu_valloc(size_t size, void *ptr) "size %zu ptr %p" disable qemu_valloc(size_t size, void *ptr) "size %zu ptr %p"
disable qemu_vfree(void *ptr) "ptr %p" disable qemu_vfree(void *ptr) "ptr %p"
# hw/virtio.c
disable virtqueue_fill(void *vq, const void *elem, unsigned int len, unsigned int idx) "vq %p elem %p len %u idx %u"
disable virtqueue_flush(void *vq, unsigned int count) "vq %p count %u"
disable virtqueue_pop(void *vq, void *elem, unsigned int in_num, unsigned int out_num) "vq %p elem %p in_num %u out_num %u"
disable virtio_queue_notify(void *vdev, int n, void *vq) "vdev %p n %d vq %p"
disable virtio_irq(void *vq) "vq %p"
disable virtio_notify(void *vdev, void *vq) "vdev %p vq %p"
# block.c # block.c
disable multiwrite_cb(void *mcb, int ret) "mcb %p ret %d" disable multiwrite_cb(void *mcb, int ret) "mcb %p ret %d"
disable bdrv_aio_multiwrite(void *mcb, int num_callbacks, int num_reqs) "mcb %p num_callbacks %d num_reqs %d" disable bdrv_aio_multiwrite(void *mcb, int num_callbacks, int num_reqs) "mcb %p num_callbacks %d num_reqs %d"