[Bochs-cvs] [12725] trunk/bochs/cpu/paging.cc

[<ssh...@us...>]

Revision: 12725
Author:   sshwarts
Date:     2015-04-21 08:20:28 +0000 (Tue, 21 Apr 2015)
Log Message:
-----------
fix compilation err when SVM is enabled

Modified Paths:
--------------
    trunk/bochs/cpu/paging.cc

Modified: trunk/bochs/cpu/paging.cc
===================================================================
--- trunk/bochs/cpu/paging.cc	2015-04-19 20:47:55 UTC (rev 12724)
+++ trunk/bochs/cpu/paging.cc	2015-04-21 08:20:28 UTC (rev 12725)
@@ -1429,6 +1429,7 @@
 {
   bx_phy_address entry_addr[4];
   Bit64u entry[4];
+  BxMemtype entry_memtype[4] = { BX_MEMTYPE_INVALID };
   bx_bool nx_fault = 0;
   int leaf;
 
@@ -1482,7 +1483,7 @@
     nested_page_fault(ERROR_PROTECTION, guest_paddr, rw, is_page_walk);
 
   // Update A/D bits if needed
-  update_access_dirty_PAE(entry_addr, entry, BX_LEVEL_PML4, leaf, isWrite);
+  update_access_dirty_PAE(entry_addr, entry, entry_memtype, BX_LEVEL_PML4, leaf, isWrite);
 
   // Make up the physical page frame address
   return ppf | (bx_phy_address)(guest_paddr & offset_mask);	
@@ -1492,6 +1493,7 @@
 {
   bx_phy_address entry_addr[2];
   Bit64u entry[2];
+  BxMemtype entry_memtype[2] = { BX_MEMTYPE_INVALID };
   bx_bool nx_fault = 0;
   int leaf;
 
@@ -1559,7 +1561,7 @@
     nested_page_fault(ERROR_PROTECTION, guest_paddr, rw, is_page_walk);
 
   // Update A/D bits if needed
-  update_access_dirty_PAE(entry_addr, entry, BX_LEVEL_PDE, leaf, isWrite);
+  update_access_dirty_PAE(entry_addr, entry, entry_memtype, BX_LEVEL_PDE, leaf, isWrite);
 
   Bit32u page_offset = PAGE_OFFSET(guest_paddr);
   return ppf | page_offset;
@@ -1569,6 +1571,7 @@
 {
   bx_phy_address entry_addr[2];
   Bit32u entry[2];
+  BxMemtype entry_memtype[2] = { BX_MEMTYPE_INVALID };
   int leaf;
 
   SVM_CONTROLS *ctrls = &BX_CPU_THIS_PTR vmcb.ctrls;
@@ -1615,7 +1618,7 @@
   if (!priv_check[priv_index])
     nested_page_fault(ERROR_PROTECTION, guest_paddr, rw, is_page_walk);
 
-  update_access_dirty(entry_addr, entry, leaf, isWrite);
+  update_access_dirty(entry_addr, entry, entry_memtype, leaf, isWrite);
 
   Bit32u page_offset = PAGE_OFFSET(guest_paddr);
   return ppf | page_offset;