[PATCH] xsm/flask: Fix XSM support for HVMOP_track_dirty_vram

[PATCH] xsm/flask: Fix XSM support for HVMOP_track_dirty_vram

[Aurelien Chartier]

This patch is intended for Xen 4.1 branch.

The XSM check for HVMOP_track_dirty_vram is done with a call to xsm_hvm_param,
therefore the switch handling that case should be located in flask_hvm_param
and not in flask_hvmcontext.

This was fixed upstream by the two following patches :
* 875756ca34fabc7243c4a682ffd7008710a907e2 (add case in flask_hvm_param)
* 652f94327383c5517b709f0a3e4b970216b3d375 (remove case from flask_hvmcontext)

Signed-off-by: Aurelien Chartier <aurelien.chartier@citrix.com>
---
 xen/xsm/flask/hooks.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 02a0d20..8f49e67 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -844,9 +844,6 @@ static int flask_hvmcontext(struct domain *d, uint32_t cmd)
     case XEN_DOMCTL_gethvmcontext_partial:
         perm = HVM__GETHVMC;
         break;
-    case HVMOP_track_dirty_vram:
-        perm = HVM__TRACKDIRTYVRAM;
-        break;
     default:
         return -EPERM;
     }
@@ -885,6 +882,9 @@ static int flask_hvm_param(struct domain *d, unsigned long op)
     case HVMOP_get_param:
         perm = HVM__GETPARAM;
         break;
+    case HVMOP_track_dirty_vram:
+        perm = HVM__TRACKDIRTYVRAM;
+        break;
     default:
         return -EPERM;
     }
-- 
1.7.10.4

Re: [PATCH] xsm/flask: Fix XSM support for HVMOP_track_dirty_vram

[Daniel De Graaf]

On 07/02/2013 06:03 AM, Aurelien Chartier wrote:
> This patch is intended for Xen 4.1 branch.
>
> The XSM check for HVMOP_track_dirty_vram is done with a call to xsm_hvm_param,
> therefore the switch handling that case should be located in flask_hvm_param
> and not in flask_hvmcontext.
>
> This was fixed upstream by the two following patches :
> * 875756ca34fabc7243c4a682ffd7008710a907e2 (add case in flask_hvm_param)
> * 652f94327383c5517b709f0a3e4b970216b3d375 (remove case from flask_hvmcontext)
>
> Signed-off-by: Aurelien Chartier <aurelien.chartier@citrix.com>

Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>