[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1292005674 0
# Node ID e5bb61a0ad09b37e890206e3044fec209136cafe
# Parent  367dbb68bfa30c180b03d09abe0bf5871608151a
# Parent  5b779981345fbf9c3b93e66f36fedb9e2a26ba93
Merge
---
 xen/arch/x86/mm/mem_sharing.c  |    5 +----
 xen/include/public/mem_event.h |   16 +---------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff -r 367dbb68bfa3 -r e5bb61a0ad09 xen/arch/x86/mm/mem_sharing.c
--- a/xen/arch/x86/mm/mem_sharing.c     Fri Dec 10 18:27:17 2010 +0000
+++ b/xen/arch/x86/mm/mem_sharing.c     Fri Dec 10 18:27:54 2010 +0000
@@ -319,11 +319,10 @@ static struct page_info* mem_sharing_all
         vcpu_pause_nosync(v);
         req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED;
     }
-        
+
     /* XXX: Need to reserve a request, not just check the ring! */
     if(mem_event_check_ring(d)) return page;
 
-    req.flags |= MEM_EVENT_FLAG_OUT_OF_MEM;
     req.gfn = gfn;
     req.p2mt = p2m_ram_shared;
     req.vcpu_id = v->vcpu_id;
@@ -347,8 +346,6 @@ int mem_sharing_sharing_resume(struct do
     /* Unpause domain/vcpu */
     if( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED )
         vcpu_unpause(d->vcpu[rsp.vcpu_id]);
-    if( rsp.flags & MEM_EVENT_FLAG_DOM_PAUSED )
-        domain_unpause(d);
 
     return 0;
 }
diff -r 367dbb68bfa3 -r e5bb61a0ad09 xen/include/public/mem_event.h
--- a/xen/include/public/mem_event.h    Fri Dec 10 18:27:17 2010 +0000
+++ b/xen/include/public/mem_event.h    Fri Dec 10 18:27:54 2010 +0000
@@ -23,21 +23,11 @@
 #ifndef _XEN_PUBLIC_MEM_EVENT_H
 #define _XEN_PUBLIC_MEM_EVENT_H
 
-
 #include "xen.h"
 #include "io/ring.h"
 
-
-/* Memory event notification modes */
-#define MEM_EVENT_MODE_ASYNC    0
-#define MEM_EVENT_MODE_SYNC     (1 << 0)
-#define MEM_EVENT_MODE_SYNC_ALL (1 << 1)
-
 /* Memory event flags */
 #define MEM_EVENT_FLAG_VCPU_PAUSED  (1 << 0)
-#define MEM_EVENT_FLAG_DOM_PAUSED   (1 << 1)
-#define MEM_EVENT_FLAG_OUT_OF_MEM   (1 << 2)
-
 
 typedef struct mem_event_shared_page {
     uint32_t port;
@@ -45,18 +35,14 @@ typedef struct mem_event_shared_page {
 
 typedef struct mem_event_st {
     uint64_t gfn;
-    uint64_t offset;
     uint32_t p2mt;
-    int32_t vcpu_id;
+    uint32_t vcpu_id;
     uint64_t flags;
 } mem_event_request_t, mem_event_response_t;
 
-
 DEFINE_RING_TYPES(mem_event, mem_event_request_t, mem_event_response_t);
 
-
 #endif
-
 
 /*
  * Local variables:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog