From: Keir Fraser <keir@xensource.com>
Date: Thu, 25 Oct 2007 14:01:59 +0000 (+0100)
Subject: hvm: In xenstore_process_logdirty_event(), if a stale shared memory
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14828^2~44
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0f69f64f5c1de50ebea75b91800c20c585c1b4b9;p=xen.git

hvm: In xenstore_process_logdirty_event(), if a stale shared memory
key is encountered reset 'seg' to NULL so the shared memory
initialization can be retried later.

Signed-off-by: Ben Guthro <bguthro@virtualron.com>
Signed-off-by: Robert Phillips <rphillips@virtualiron.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/tools/ioemu/xenstore.c b/tools/ioemu/xenstore.c
index 2b2897cec7..ed85eea5f0 100644
--- a/tools/ioemu/xenstore.c
+++ b/tools/ioemu/xenstore.c
@@ -318,6 +318,9 @@ void xenstore_process_logdirty_event(void)
         if (logdirty_bitmap_size != *(uint32_t *)seg) {
             fprintf(logfile, "Log-dirty: got %u, calc %lu\n", 
                     *(uint32_t *)seg, logdirty_bitmap_size);
+            /* Stale key: wait for next watch */
+            shmdt(seg);
+            seg = NULL;
             return;
         }