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

memory: MemoryRegion: use /machine as default owner 

This will be added (after QOMification) as the QOM parent.

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-06-11 10:52:32 +02:00
parent 563890c7c7
commit b5c2c3d0c8
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
memory.c
View File

@ -849,7 +849,7 @@ void memory_region_init(MemoryRegion *mr,
{ {
mr->ops = &unassigned_mem_ops; mr->ops = &unassigned_mem_ops;
mr->opaque = NULL; mr->opaque = NULL;
mr->owner = owner; mr->owner = owner ? owner : qdev_get_machine();
mr->iommu_ops = NULL; mr->iommu_ops = NULL;
mr->container = NULL; mr->container = NULL;
mr->size = int128_make64(size); mr->size = int128_make64(size);

3
vl.c
View File

@ -3986,12 +3986,11 @@ int main(int argc, char **argv, char **envp)
exit(1); exit(1);
} }
cpu_exec_init_all();
current_machine = MACHINE(object_new(object_class_get_name( current_machine = MACHINE(object_new(object_class_get_name(
OBJECT_CLASS(machine_class)))); OBJECT_CLASS(machine_class))));
object_property_add_child(object_get_root(), "machine", object_property_add_child(object_get_root(), "machine",
OBJECT(current_machine), &error_abort); OBJECT(current_machine), &error_abort);
cpu_exec_init_all();
if (machine_class->hw_version) { if (machine_class->hw_version) {
qemu_set_version(machine_class->hw_version); qemu_set_version(machine_class->hw_version);