vbox: Extract Vmm_memory::Region to separate header

This enables platform-specific implementations of the struct Mem_region
type.

Issue #2016

repos/ports/src/virtualbox/accloff/sup.cc

@@ -123,7 +123,7 @@ void genode_update_tsc(void (*update_func)(void), unsigned long update_us)
 }
 
 
-bool Vmm_memory::revoke_from_vm(Region *r)
+bool Vmm_memory::revoke_from_vm(Mem_region *r)
 {
 	PWRN("%s unimplemented", __func__);
 	return false;

repos/ports/src/virtualbox/mem_region.h

@@ -0,0 +1,75 @@
+/*
+ * \brief  Memory region types
+ * \author Norman Feske
+ * \author Adrian-Ken Rueegsegger
+ * \author Reto Buerki
+ * \date   2013-09-02
+ */
+
+/*
+ * Copyright (C) 2013 Genode Labs GmbH
+ *
+ * This file is distributed under the terms of the GNU General Public License
+ * version 2.
+ */
+
+#ifndef _MEM_REGION_H_
+#define _MEM_REGION_H_
+
+/* Genode includes */
+#include <util/list.h>
+#include <rm_session/connection.h>
+#include <region_map/client.h>
+
+/* VirtualBox includes */
+#include <VBox/vmm/pgm.h>
+
+struct Mem_region;
+
+struct Mem_region : public  Genode::List<Mem_region>::Element,
+					private Genode::Rm_connection,
+					public  Genode::Region_map_client
+{
+	typedef Genode::Ram_session Ram_session;
+	typedef Genode::Region_map  Region_map;
+
+	PPDMDEVINS           pDevIns;
+	unsigned const       iRegion;
+	RTGCPHYS             vm_phys;
+	PFNPGMR3PHYSHANDLER  pfnHandlerR3;
+	void                *pvUserR3;
+	PGMPHYSHANDLERTYPE   enmType;
+
+	Genode::addr_t       _base;
+	Genode::size_t       _size;
+
+	Mem_region(Ram_session &ram, size_t size, PPDMDEVINS pDevIns,
+	           unsigned iRegion, unsigned sub_rm_max_ds = 32 * 1024 * 1024)
+	:
+		Region_map_client(Rm_connection::create(size)),
+		pDevIns(pDevIns),
+		iRegion(iRegion),
+		vm_phys(0), pfnHandlerR3(0), pvUserR3(0),
+		_base(Genode::env()->rm_session()->attach(Region_map_client::dataspace())),
+		_size(size)
+
+	{
+		Genode::addr_t rest_size = _size;
+		Genode::addr_t map_size  = rest_size < sub_rm_max_ds ? rest_size : sub_rm_max_ds;
+
+		do {
+			Genode::Ram_dataspace_capability ds = Genode::env()->ram_session()->alloc(map_size);
+			attach_at(ds, _size - rest_size, map_size);
+
+			rest_size -= map_size;
+			map_size   = rest_size < sub_rm_max_ds ? rest_size : sub_rm_max_ds;
+		} while (rest_size);
+	}
+
+	size_t size() { return _size; }
+
+	template <typename T>
+	T * local_addr() { return reinterpret_cast<T *>(_base); }
+};
+
+#endif /* _MEM_REGION_H_ */

repos/ports/src/virtualbox/spec/nova/sup.cc

@@ -216,7 +216,7 @@ void genode_update_tsc(void (*update_func)(void), unsigned long update_us)
 }
 
 
-bool Vmm_memory::revoke_from_vm(Region *r)
+bool Vmm_memory::revoke_from_vm(Mem_region *r)
 {
 	Assert(r);
 

repos/ports/src/virtualbox/vmm_memory.h

@@ -26,8 +26,9 @@
 #include <base/env.h>
 #include <base/lock.h>
 #include <util/list.h>
-#include <rm_session/connection.h>
+
-#include <region_map/client.h>
+/* Genode/Virtualbox includes */
+#include "mem_region.h"
 
 #define PAGE_SIZE BACKUP_PAGESIZE
 
@@ -37,77 +38,33 @@
 
 class Vmm_memory
 {
-	struct Region;
+	typedef Genode::Ram_session      Ram_session;
-
+	typedef Genode::Region_map       Region_map;
-	typedef Genode::Ram_session            Ram_session;
+	typedef Genode::size_t           size_t;
-	typedef Genode::Region_map             Region_map;
+	typedef Genode::Lock             Lock;
-	typedef Genode::size_t                 size_t;
+	typedef Genode::List<Mem_region> Mem_region_list;
-	typedef Genode::Lock                   Lock;
-	typedef Genode::List<Region>           Region_list;
 
 	private:
 
-		struct Region : public  Region_list::Element,
+		Lock            _lock;
-		                private Genode::Rm_connection,
+		Mem_region_list _regions;
-		                public  Genode::Region_map_client
-		{
-			PPDMDEVINS           pDevIns;
-			unsigned const       iRegion;
-			RTGCPHYS             vm_phys; 
-			PFNPGMR3PHYSHANDLER  pfnHandlerR3;
-			void                *pvUserR3;
-			PGMPHYSHANDLERTYPE   enmType;
-
-			Genode::addr_t       _base;
-			Genode::size_t       _size;
-
-			Region(Ram_session &ram, size_t size, PPDMDEVINS pDevIns,
-			           unsigned iRegion, unsigned sub_rm_max_ds = 32 * 1024 * 1024)
-			:
-				Region_map_client(Rm_connection::create(size)),
-				pDevIns(pDevIns),
-				iRegion(iRegion),
-				vm_phys(0), pfnHandlerR3(0), pvUserR3(0),
-				_base(Genode::env()->rm_session()->attach(Region_map_client::dataspace())),
-				_size(size)
-			{
-				Genode::addr_t rest_size = _size;
-				Genode::addr_t map_size  = rest_size < sub_rm_max_ds ? rest_size : sub_rm_max_ds;
-
-				do {
-					Genode::Ram_dataspace_capability ds = Genode::env()->ram_session()->alloc(map_size);
-					attach_at(ds, _size - rest_size, map_size);
-
-					rest_size -= map_size;
-					map_size   = rest_size < sub_rm_max_ds ? rest_size : sub_rm_max_ds;
-				} while (rest_size);
- 			}
-
-			size_t size() { return _size; }
-
-			template <typename T>
-			T * local_addr() { return reinterpret_cast<T *>(_base); }
-		};
-
-		Lock        _lock;
-		Region_list _regions;
 
 		/**
 		 * Backing store
 		 */
 		Genode::Ram_session &_ram;
 
-		Region *_lookup_unsynchronized(PPDMDEVINS pDevIns, unsigned iRegion)
+		Mem_region *_lookup_unsynchronized(PPDMDEVINS pDevIns, unsigned iRegion)
 		{
-			for (Region *r = _regions.first(); r; r = r->next())
+			for (Mem_region *r = _regions.first(); r; r = r->next())
 				if (r->pDevIns == pDevIns && r->iRegion == iRegion)
 					return r;
 			return 0;
 		}
 
-		Region *_lookup_unsynchronized(RTGCPHYS vm_phys, size_t size)
+		Mem_region *_lookup_unsynchronized(RTGCPHYS vm_phys, size_t size)
 		{
-			for (Region *r = _regions.first(); r; r = r->next())
+			for (Mem_region *r = _regions.first(); r; r = r->next())
 				if (r->vm_phys && r->vm_phys <= vm_phys
 				    && vm_phys - r->vm_phys < r->size()
 				    && r->size() - (vm_phys - r->vm_phys) >= size)
@@ -129,8 +86,8 @@ class Vmm_memory
 			Lock::Guard guard(_lock);
 
 			try {
-				Region *r = new (Genode::env()->heap())
+				Mem_region *r = new (Genode::env()->heap())
-				                Region(_ram, cb, pDevIns, iRegion);
+				                Mem_region(_ram, cb, pDevIns, iRegion);
 				_regions.insert(r);
 
 				return r->local_addr<void>();
@@ -162,7 +119,7 @@ class Vmm_memory
 		{
 			Lock::Guard guard(_lock);
 
-			Region *r = _lookup_unsynchronized(vm_phys, size);
+			Mem_region *r = _lookup_unsynchronized(vm_phys, size);
 
 			if (!r) return false;
 
@@ -180,7 +137,7 @@ class Vmm_memory
 		{
 			Lock::Guard guard(_lock);
 
-			Region *r = _lookup_unsynchronized(vm_phys, size);
+			Mem_region *r = _lookup_unsynchronized(vm_phys, size);
 
 			if (!r) return 0;
 
@@ -196,7 +153,7 @@ class Vmm_memory
 		{
 			Lock::Guard guard(_lock);
 
-			Region *r = _lookup_unsynchronized(vm_phys, size);
+			Mem_region *r = _lookup_unsynchronized(vm_phys, size);
 
 			if (!r)
 				return false;
@@ -212,7 +169,7 @@ class Vmm_memory
 		{
 			Lock::Guard guard(_lock);
 
-			Region *r = _lookup_unsynchronized(pDevIns, iRegion);
+			Mem_region *r = _lookup_unsynchronized(pDevIns, iRegion);
 
 			if (r) r->vm_phys = GCPhys;
 
@@ -223,7 +180,7 @@ class Vmm_memory
 		{
 			Lock::Guard guard(_lock);
 
-			Region *r = _lookup_unsynchronized(GCPhys, size);
+			Mem_region *r = _lookup_unsynchronized(GCPhys, size);
 			if (!r) return false;
 
 			bool result = revoke_from_vm(r);
@@ -237,7 +194,7 @@ class Vmm_memory
 		/**
 		 * Platform specific implemented.
 		 */
-		bool revoke_from_vm(Region *r);
+		bool revoke_from_vm(Mem_region *r);
 
 		/**
 		 * Revoke all memory (RAM or ROM) from VM
@@ -246,7 +203,7 @@ class Vmm_memory
 		{
 			Lock::Guard guard(_lock);
 
-			for (Region *r = _regions.first(); r; r = r->next())
+			for (Mem_region *r = _regions.first(); r; r = r->next())
 			{
 				bool ok = revoke_from_vm(r);
 				Assert(ok);