xsm/flask: Fix XSM support for HVMOP_track_dirty_vram

PATCH In review Aurelien Chartier 2 participants 2 messages Jul 2, 2013

lore

Share & tools

lore

Aurelien Chartier

author

2013-07-02 10:03 UTC #0 lore raw

PATCH 1/1 xsm/flask: Fix XSM support for HVMOP_track_dirty_vram

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 <[email protected]>

---
 xen/xsm/flask/hooks.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

xen/xsm/flask/hooks.c +3 -3

index 02a0d20..8f49e67 100644
@@ -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;
     }

Signature · 1 line

1.7.10.4

Daniel De Graaf

Acked-by on v1 1/1

2013-07-02 14:54 UTC #1 lore raw

Quoted 11 lines · 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 <[email protected]>

Acked-by Daniel De Graaf <[email protected]>