[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/20] memory-device: trace when pre_assigning/as
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v2 12/20] memory-device: trace when pre_assigning/assigning/unassigning addresses |
Date: |
Wed, 29 Aug 2018 17:36:16 +0200 |
Let's trace the address when pre_pluggin/plugging/unplugging a memory device.
Trace it when pre_plugging as well as when plugging, so we really know
when a specific address is actually used.
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/mem/memory-device.c | 6 ++++++
hw/mem/pc-dimm.c | 8 --------
hw/mem/trace-events | 5 ++++-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 5f62eb6a94..a31ba73ea7 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -17,6 +17,7 @@
#include "qemu/range.h"
#include "hw/virtio/vhost.h"
#include "sysemu/kvm.h"
+#include "trace.h"
static gint memory_device_addr_sort(gconstpointer a, gconstpointer b)
{
@@ -274,6 +275,9 @@ void memory_device_pre_plug(MemoryDeviceState *md,
MachineState *ms,
goto out;
}
mdc->set_addr(md, addr, &local_err);
+ if (!local_err) {
+ trace_memory_device_pre_assign_address(addr);
+ }
out:
error_propagate(errp, local_err);
}
@@ -290,6 +294,7 @@ void memory_device_plug(MemoryDeviceState *md, MachineState
*ms)
memory_region_add_subregion(&ms->device_memory->mr,
addr - ms->device_memory->base, mr);
+ trace_memory_device_assign_address(addr);
}
void memory_device_unplug(MemoryDeviceState *md, MachineState *ms)
@@ -302,6 +307,7 @@ void memory_device_unplug(MemoryDeviceState *md,
MachineState *ms)
g_assert(ms->device_memory);
memory_region_del_subregion(&ms->device_memory->mr, mr);
+ trace_memory_device_unassign_address(mdc->get_addr(md));
}
static const TypeInfo memory_device_info = {
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 634335f984..732b3b8a1d 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -33,7 +33,6 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine,
const uint64_t *legacy_align, Error **errp)
{
Error *local_err = NULL;
- uint64_t addr;
int slot;
slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
@@ -48,13 +47,6 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState
*machine,
memory_device_pre_plug(MEMORY_DEVICE(dev), machine, legacy_align,
&local_err);
- if (local_err) {
- goto out;
- }
-
- addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP,
- &error_abort);
- trace_mhp_pc_dimm_assigned_address(addr);
out:
error_propagate(errp, local_err);
}
diff --git a/hw/mem/trace-events b/hw/mem/trace-events
index e150dcc497..b40482077e 100644
--- a/hw/mem/trace-events
+++ b/hw/mem/trace-events
@@ -2,4 +2,7 @@
# hw/mem/pc-dimm.c
mhp_pc_dimm_assigned_slot(int slot) "%d"
-mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64
+# hw/mem/memory-device.c
+memory_device_pre_assign_address(uint64_t addr) "0x%"PRIx64
+memory_device_assign_address(uint64_t addr) "0x%"PRIx64
+memory_device_unassign_address(uint64_t addr) "0x%"PRIx64
--
2.17.1
- Re: [Qemu-devel] [PATCH v2 01/20] memory-device: fix error message when hinted address is too small, (continued)
- [Qemu-devel] [PATCH v2 03/20] memory-device: introduce separate config option, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 04/20] memory-device: get_region_size()/get_plugged_size() might fail, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 05/20] memory-device: convert get_region_size() to get_memory_region(), David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 06/20] memory-device: document MemoryDeviceClass, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 07/20] memory-device: add device class function set_addr(), David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 08/20] pc-dimm: implement memory device class function set_addr(), David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 09/20] memory-device: complete factoring out pre_plug handling, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 10/20] memory-device: complete factoring out plug handling, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 11/20] memory-device: complete factoring out unplug handling, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 12/20] memory-device: trace when pre_assigning/assigning/unassigning addresses,
David Hildenbrand <=
- [Qemu-devel] [PATCH v2 13/20] hw/acpi-build: only indicate nvdimm and pc-dimm, David Hildenbrand, 2018/08/29
- [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, David Hildenbrand, 2018/08/29
- Re: [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, Dr. David Alan Gilbert, 2018/08/31
- Re: [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, Dr. David Alan Gilbert, 2018/08/31
- Re: [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, David Hildenbrand, 2018/08/31
- Re: [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, Dr. David Alan Gilbert, 2018/08/31
- Re: [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, David Hildenbrand, 2018/08/31
- Re: [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, Dr. David Alan Gilbert, 2018/08/31
- Re: [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, Eric Blake, 2018/08/31
Re: [Qemu-devel] [PATCH v2 14/20] memory-device: ids of virtio based devices are special, Eduardo Habkost, 2018/08/31