Commit b5c2c3d0 authored Jun 11, 2014 by Paolo Bonzini

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>

parent 563890c7

memory.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

vl.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);