[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/15] memory: MemoryRegion: use /machine as default
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 08/15] memory: MemoryRegion: use /machine as default owner |
Date: |
Tue, 1 Jul 2014 10:34:58 +0200 |
This will be added (after QOMification) as the QOM parent.
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
memory.c | 2 +-
vl.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/memory.c b/memory.c
index b91a60a..7eaa1e9 100644
--- a/memory.c
+++ b/memory.c
@@ -849,7 +849,7 @@ void memory_region_init(MemoryRegion *mr,
{
mr->ops = &unassigned_mem_ops;
mr->opaque = NULL;
- mr->owner = owner;
+ mr->owner = owner ? owner : qdev_get_machine();
mr->iommu_ops = NULL;
mr->container = NULL;
mr->size = int128_make64(size);
diff --git a/vl.c b/vl.c
index 41ddcd2..88feeab 100644
--- a/vl.c
+++ b/vl.c
@@ -3986,12 +3986,11 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- cpu_exec_init_all();
-
current_machine = MACHINE(object_new(object_class_get_name(
OBJECT_CLASS(machine_class))));
object_property_add_child(object_get_root(), "machine",
OBJECT(current_machine), &error_abort);
+ cpu_exec_init_all();
if (machine_class->hw_version) {
qemu_set_version(machine_class->hw_version);
--
1.8.3.1
- [Qemu-devel] [PULL for 2.1 00/15] MemoryRegion QOMification, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 01/15] qom: add object_property_add_alias(), Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 03/15] qom: allow creating an alias of a child<> property, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 05/15] qom: object: remove parent pointer when unparenting, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 02/15] qom: add a generic mechanism to resolve paths, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 06/15] qom: object: Ignore refs/unrefs of NULL, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 04/15] mc146818rtc: add "rtc-time" link to "/machine/rtc", Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 08/15] memory: MemoryRegion: use /machine as default owner,
Paolo Bonzini <=
- [Qemu-devel] [PULL 09/15] memory: MemoryRegion: QOMify, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 10/15] memory: MemoryRegion: replace owner field with QOM parent, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 07/15] libqtest: escape strings in QMP commands, fix leak, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 12/15] memory: MemoryRegion: Add may-overlap and priority props, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 11/15] memory: MemoryRegion: Add container and addr props, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 13/15] memory: MemoryRegion: Add size property, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 14/15] memory: do not give a name to the internal exec.c regions, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 15/15] qdev: correctly send DEVICE_DELETED for recursively-deleted devices, Paolo Bonzini, 2014/07/01
- Re: [Qemu-devel] [PULL for 2.1 00/15] MemoryRegion QOMification, Peter Maydell, 2014/07/01