From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Mon, 9 Nov 2009 18:04:34 +0000 (+0000)
Subject: intel: Use xenstore_read/write instead of xenstore_dom_read/write,
X-Git-Url: http://xenbits.xen.org/gitweb?a=commitdiff_plain;h=700f1c0272765049f46e6d051e5bbcb27d266d01;p=xenclient%2Fioemu-pq.git

intel: Use xenstore_read/write instead of xenstore_dom_read/write,
       becase the watch gives use the full path.
---

diff --git a/master/intel b/master/intel
index 53f8e6c..864b69d 100644
--- a/master/intel
+++ b/master/intel
@@ -200,7 +200,7 @@ index 90bd544..e4e27a9 100644
      s->graphic_mode = -1;
      vga_update_display(s);
 diff --git a/intel.c b/intel.c
-index 62701cc..d603e89 100644
+index 62701cc..1f87945 100644
 --- a/intel.c
 +++ b/intel.c
 @@ -11,6 +11,7 @@
@@ -211,7 +211,7 @@ index 62701cc..d603e89 100644
  #include "console.h"
  #include "sysemu.h"
  
-@@ -405,24 +406,16 @@ static void intel_focus(int focus)
+@@ -405,28 +406,20 @@ static void intel_focus(int focus)
              focus, IntelX, IntelY, IntelPitch);
  }
  
@@ -235,13 +235,28 @@ index 62701cc..d603e89 100644
      int enter = (int)opaque;
  
 -    state = xenstore_dom_read(domid, path, NULL);
-+    if (!(tmp = xenstore_dom_read(domid, path, NULL)))
++    if (!(tmp = xenstore_read(path)))
 +        return;
 +    state = strtol(tmp, NULL, 10);
 +    free(tmp);
      if (state == 1)
      {
          intel_focus(enter);
+-        xenstore_dom_write(domid, path, "2");
++        xenstore_write(path, "2");
+     }
+ }
+ 
+@@ -509,7 +502,7 @@ void intel_display_init(DisplayState *ds)
+         dpy_resize(ds);
+     }
+ 
+-    xenstore_dom_watch(domid, "switcher/enter", intel_enter_leave, (void*)0);
+-    xenstore_dom_watch(domid, "switcher/leave", intel_enter_leave, (void*)1);
++    xenstore_dom_watch(domid, "switcher/enter", intel_enter_leave, (void*)1);
++    xenstore_dom_watch(domid, "switcher/leave", intel_enter_leave, (void*)0);
+     lds = ds;
+ }
 diff --git a/vl.c b/vl.c
 index 6350384..cf7ad19 100644
 --- a/vl.c