memory.h: Add memory_region_init_{ram, rom, rom_device}() handling migration (b08199c6) · Commits · SUMMER2020 / students / proj-2021291

include/exec/memory.h

+88 −0

Original line number	Diff line number	Diff line
		@@ -678,6 +678,94 @@ void memory_region_init_iommu(void *_iommu_mr,
		const char *name,
		uint64_t size);

		/**
		* memory_region_init_ram - Initialize RAM memory region. Accesses into the
		* region will modify memory directly.
		*
		* @mr: the #MemoryRegion to be initialized
		* @owner: the object that tracks the region's reference count (must be
		* TYPE_DEVICE or a subclass of TYPE_DEVICE, or NULL)
		* @name: name of the memory region
		* @size: size of the region in bytes
		* @errp: pointer to Error*, to store an error if it happens.
		*
		* This function allocates RAM for a board model or device, and
		* arranges for it to be migrated (by calling vmstate_register_ram()
		* if @owner is a DeviceState, or vmstate_register_ram_global() if
		* @owner is NULL).
		*
		* TODO: Currently we restrict @owner to being either NULL (for
		* global RAM regions with no owner) or devices, so that we can
		* give the RAM block a unique name for migration purposes.
		* We should lift this restriction and allow arbitrary Objects.
		* If you pass a non-NULL non-device @owner then we will assert.
		*/
		void memory_region_init_ram(MemoryRegion *mr,
		struct Object *owner,
		const char *name,
		uint64_t size,
		Error **errp);

		/**
		* memory_region_init_rom: Initialize a ROM memory region.
		*
		* This has the same effect as calling memory_region_init_ram()
		* and then marking the resulting region read-only with
		* memory_region_set_readonly(). This includes arranging for the
		* contents to be migrated.
		*
		* TODO: Currently we restrict @owner to being either NULL (for
		* global RAM regions with no owner) or devices, so that we can
		* give the RAM block a unique name for migration purposes.
		* We should lift this restriction and allow arbitrary Objects.
		* If you pass a non-NULL non-device @owner then we will assert.
		*
		* @mr: the #MemoryRegion to be initialized.
		* @owner: the object that tracks the region's reference count
		* @name: Region name, becomes part of RAMBlock name used in migration stream
		* must be unique within any device
		* @size: size of the region.
		* @errp: pointer to Error*, to store an error if it happens.
		*/
		void memory_region_init_rom(MemoryRegion *mr,
		struct Object *owner,
		const char *name,
		uint64_t size,
		Error **errp);

		/**
		* memory_region_init_rom_device: Initialize a ROM memory region.
		* Writes are handled via callbacks.
		*
		* This function initializes a memory region backed by RAM for reads
		* and callbacks for writes, and arranges for the RAM backing to
		* be migrated (by calling vmstate_register_ram()
		* if @owner is a DeviceState, or vmstate_register_ram_global() if
		* @owner is NULL).
		*
		* TODO: Currently we restrict @owner to being either NULL (for
		* global RAM regions with no owner) or devices, so that we can
		* give the RAM block a unique name for migration purposes.
		* We should lift this restriction and allow arbitrary Objects.
		* If you pass a non-NULL non-device @owner then we will assert.
		*
		* @mr: the #MemoryRegion to be initialized.
		* @owner: the object that tracks the region's reference count
		* @ops: callbacks for write access handling (must not be NULL).
		* @name: Region name, becomes part of RAMBlock name used in migration stream
		* must be unique within any device
		* @size: size of the region.
		* @errp: pointer to Error*, to store an error if it happens.
		*/
		void memory_region_init_rom_device(MemoryRegion *mr,
		struct Object *owner,
		const MemoryRegionOps *ops,
		void *opaque,
		const char *name,
		uint64_t size,
		Error **errp);


		/**
		* memory_region_owner: get a memory region's owner.
		*

include/hw/boards.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,8 @@
		*
		* Smaller pieces of memory (display RAM, static RAMs, etc) don't need
		* to be backed via the -mem-path memory backend and can simply
		* be created via memory_region_init_ram().
		* be created via memory_region_allocate_aux_memory() or
		* memory_region_init_ram().
		*/
		void memory_region_allocate_system_memory(MemoryRegion mr, Object owner,
		const char *name,

memory.c

+76 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include "sysemu/sysemu.h"
		#include "hw/misc/mmio_interface.h"
		#include "hw/qdev-properties.h"
		#include "migration/vmstate.h"

		//#define DEBUG_UNASSIGNED

		@@ -2848,6 +2849,81 @@ void mtree_info(fprintf_function mon_printf, void *f, bool flatview)
		}
		}

		void memory_region_init_ram(MemoryRegion *mr,
		struct Object *owner,
		const char *name,
		uint64_t size,
		Error **errp)
		{
		DeviceState *owner_dev;
		Error *err = NULL;

		memory_region_init_ram_nomigrate(mr, owner, name, size, &err);
		if (err) {
		error_propagate(errp, err);
		return;
		}
		/* This will assert if owner is neither NULL nor a DeviceState.
		* We only want the owner here for the purposes of defining a
		* unique name for migration. TODO: Ideally we should implement
		* a naming scheme for Objects which are not DeviceStates, in
		* which case we can relax this restriction.
		*/
		owner_dev = DEVICE(owner);
		vmstate_register_ram(mr, owner_dev);
		}

		void memory_region_init_rom(MemoryRegion *mr,
		struct Object *owner,
		const char *name,
		uint64_t size,
		Error **errp)
		{
		DeviceState *owner_dev;
		Error *err = NULL;

		memory_region_init_rom_nomigrate(mr, owner, name, size, &err);
		if (err) {
		error_propagate(errp, err);
		return;
		}
		/* This will assert if owner is neither NULL nor a DeviceState.
		* We only want the owner here for the purposes of defining a
		* unique name for migration. TODO: Ideally we should implement
		* a naming scheme for Objects which are not DeviceStates, in
		* which case we can relax this restriction.
		*/
		owner_dev = DEVICE(owner);
		vmstate_register_ram(mr, owner_dev);
		}

		void memory_region_init_rom_device(MemoryRegion *mr,
		struct Object *owner,
		const MemoryRegionOps *ops,
		void *opaque,
		const char *name,
		uint64_t size,
		Error **errp)
		{
		DeviceState *owner_dev;
		Error *err = NULL;

		memory_region_init_rom_device_nomigrate(mr, owner, ops, opaque,
		name, size, &err);
		if (err) {
		error_propagate(errp, err);
		return;
		}
		/* This will assert if owner is neither NULL nor a DeviceState.
		* We only want the owner here for the purposes of defining a
		* unique name for migration. TODO: Ideally we should implement
		* a naming scheme for Objects which are not DeviceStates, in
		* which case we can relax this restriction.
		*/
		owner_dev = DEVICE(owner);
		vmstate_register_ram(mr, owner_dev);
		}

		static const TypeInfo memory_region_info = {
		.parent = TYPE_OBJECT,
		.name = TYPE_MEMORY_REGION,