xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Aurelien Chartier <aurelien.chartier@citrix.com>
To: xen-devel@lists.xen.org
Cc: dgdegra@tycho.nsa.gov,
	Aurelien Chartier <aurelien.chartier@citrix.com>,
	jbeulich@suse.com
Subject: [PATCH] xsm/flask: Fix XSM support for HVMOP_track_dirty_vram
Date: Tue, 2 Jul 2013 11:03:36 +0100	[thread overview]
Message-ID: <1372759416-5372-1-git-send-email-aurelien.chartier@citrix.com> (raw)

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

             reply	other threads:[~2013-07-02 10:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-02 10:03 Aurelien Chartier [this message]
2013-07-02 14:54 ` [PATCH] xsm/flask: Fix XSM support for HVMOP_track_dirty_vram Daniel De Graaf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1372759416-5372-1-git-send-email-aurelien.chartier@citrix.com \
    --to=aurelien.chartier@citrix.com \
    --cc=dgdegra@tycho.nsa.gov \
    --cc=jbeulich@suse.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).