Skip to contentSkip to conversation

xenpaging: update xch usage

PATCH New Olaf Hering 1 participant 1 message Dec 2, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xenpaging: update xch usage

Fix double-free in xc_interface_close(), xenpaging_teardown() releases the *xch already. Remove second xc_interface_close() call.

Fix DPRINTF/ERROR usage, both macros reference a xch variable in local scope. If xc_interface_open fails for some reason, and after xc_interface_close, both can not be used anymore. Use standard printf for this case.

Instead of passing xch around, use the handle from *paging. In the updated functions, use the local xch variable.

---
 tools/xenpaging/policy.h         |    3 -
 tools/xenpaging/policy_default.c |    4 +-
 tools/xenpaging/xenpaging.c      |   65 +++++++++++++++++++--------------------
 3 files changed, 36 insertions(+), 36 deletions(-)
tools/xenpaging/policy.h +1 -2
@@ -29,8 +29,7 @@
 
 
 int policy_init(xenpaging_t *paging);
-int policy_choose_victim(xc_interface *xch,
-                         xenpaging_t *paging, domid_t domain_id,
+int policy_choose_victim(xenpaging_t *paging, domid_t domain_id,
                          xenpaging_victim_t *victim);
 void policy_notify_paged_out(domid_t domain_id, unsigned long gfn);
 void policy_notify_paged_in(domid_t domain_id, unsigned long gfn);
tools/xenpaging/policy_default.c +2 -2
@@ -67,10 +67,10 @@ int policy_init(xenpaging_t *paging)
     return rc;
 }
 
-int policy_choose_victim(xc_interface *xch,
-                         xenpaging_t *paging, domid_t domain_id,
+int policy_choose_victim(xenpaging_t *paging, domid_t domain_id,
                          xenpaging_victim_t *victim)
 {
+    struct xc_interface *xch = paging->xc_handle;
     unsigned long wrap = current_gfn;
     ASSERT(victim != NULL);
 
tools/xenpaging/xenpaging.c +33 -32

222 lines not on this page · raw message