Merge pull request #110 from tklengyel/pause_tweaks

Pause tweaks in xen_helper
tklengyel · Mar 29, 2016 · e17f8d3 · e17f8d3
2 parents 7024c7c + 97d06af
commit e17f8d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/libdrakvuf/vmi.c b/src/libdrakvuf/vmi.c
@@ -797,7 +797,7 @@ void drakvuf_loop(drakvuf_t drakvuf) {
         return;
     }
 
-    vmi_resume_vm(drakvuf->vmi);
+    drakvuf_resume(drakvuf);
 
     while (!drakvuf->interrupted) {
         PRINT_DEBUG("Waiting for events in DRAKVUF...\n");
@@ -810,7 +810,7 @@ void drakvuf_loop(drakvuf_t drakvuf) {
         }
     }
 
-    vmi_pause_vm(drakvuf->vmi);
+    drakvuf_pause(drakvuf);
     //print_sharing_info(drakvuf->xen, drakvuf->domID);
 
     PRINT_DEBUG("DRAKVUF loop finished\n");

diff --git a/src/xen_helper/xen_helper.c b/src/xen_helper/xen_helper.c
@@ -253,16 +253,16 @@ void print_sharing_info(xen_interface_t *xen, domid_t domID) {
 void xen_pause(xen_interface_t *xen, domid_t domID) {
     xc_dominfo_t info = { 0 };
 
-    if (1 == xc_domain_getinfo(xen->xc, domID, 1, &info) && info.running) {
+    if (1 == xc_domain_getinfo(xen->xc, domID, 1, &info) && info.domid == domID && !info.paused)
         xc_domain_pause(xen->xc, domID);
-    }
+
 }
 
 void xen_unpause(xen_interface_t *xen, domid_t domID) {
     do {
         xc_dominfo_t info = { 0 };
 
-        if (1 == xc_domain_getinfo(xen->xc, domID, 1, &info) && info.paused)
+        if (1 == xc_domain_getinfo(xen->xc, domID, 1, &info) && info.domid == domID && info.paused)
             xc_domain_unpause(xen->xc, domID);
         else
             break;