[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/26] Revert "vhost: add traces for memory listeners
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 01/26] Revert "vhost: add traces for memory listeners" |
Date: |
Thu, 8 Feb 2018 21:08:55 +0200 |
This reverts commit 0750b060216de69ed1f14bc08181bf4ad27fc622.
Follow up patches are reworking the memory listeners, the new mechanism
will add its own set of traces.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/vhost.c | 7 -------
hw/virtio/trace-events | 6 ------
2 files changed, 13 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 338e439..23b9e17 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -27,7 +27,6 @@
#include "hw/virtio/virtio-access.h"
#include "migration/blocker.h"
#include "sysemu/dma.h"
-#include "trace.h"
/* enabled until disconnected backend stabilizes */
#define _VHOST_DEBUG 1
@@ -694,7 +693,6 @@ static void vhost_region_add(MemoryListener *listener,
return;
}
- trace_vhost_region_add(dev, section->mr->name ?: NULL);
++dev->n_mem_sections;
dev->mem_sections = g_renew(MemoryRegionSection, dev->mem_sections,
dev->n_mem_sections);
@@ -714,7 +712,6 @@ static void vhost_region_del(MemoryListener *listener,
return;
}
- trace_vhost_region_del(dev, section->mr->name ?: NULL);
vhost_set_memory(listener, section, false);
memory_region_unref(section->mr);
for (i = 0; i < dev->n_mem_sections; ++i) {
@@ -752,8 +749,6 @@ static void vhost_iommu_region_add(MemoryListener *listener,
return;
}
- trace_vhost_iommu_region_add(dev, section->mr->name ?: NULL);
-
iommu = g_malloc0(sizeof(*iommu));
end = int128_add(int128_make64(section->offset_within_region),
section->size);
@@ -782,8 +777,6 @@ static void vhost_iommu_region_del(MemoryListener *listener,
return;
}
- trace_vhost_iommu_region_del(dev, section->mr->name ?: NULL);
-
QLIST_FOREACH(iommu, &dev->iommu_list, iommu_next) {
if (iommu->mr == section->mr &&
iommu->n.start == section->offset_within_region) {
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index 2b8f81e..775461a 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -25,9 +25,3 @@ virtio_balloon_handle_output(const char *name, uint64_t gpa)
"section name: %s g
virtio_balloon_get_config(uint32_t num_pages, uint32_t actual) "num_pages: %d
actual: %d"
virtio_balloon_set_config(uint32_t actual, uint32_t oldactual) "actual: %d
oldactual: %d"
virtio_balloon_to_target(uint64_t target, uint32_t num_pages) "balloon target:
0x%"PRIx64" num_pages: %d"
-
-# hw/virtio/vhost.c
-vhost_region_add(void *p, const char *mr) "dev %p mr %s"
-vhost_region_del(void *p, const char *mr) "dev %p mr %s"
-vhost_iommu_region_add(void *p, const char *mr) "dev %p mr %s"
-vhost_iommu_region_del(void *p, const char *mr) "dev %p mr %s"
--
MST
- [Qemu-devel] [PULL 00/26] virtio, vhost, pci, pc: features, fixes and cleanups, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 01/26] Revert "vhost: add traces for memory listeners",
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 04/26] vhost: Build temporary section list and deref after commit, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 02/26] virtio: remove event notifier cleanup call on de-assign, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 05/26] vhost: Simplify ring verification checks, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 06/26] vhost: Merge sections added to temporary list, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 07/26] vhost: Regenerate region list from changed sections list, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 09/26] vhost: Merge and delete unused callbacks, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 10/26] vhost: Move log_dirty check, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 11/26] pci-bridge/i82801b11: clear bridge registers on platform reset, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 08/26] vhost: Clean out old vhost_set_memory and friends, Michael S. Tsirkin, 2018/02/08
- [Qemu-devel] [PULL 13/26] virtio-blk: enable multiple vectors when using multiple I/O queues, Michael S. Tsirkin, 2018/02/08