From: Kamala Narasimhan <kamala.narasimhan@citrix.com>
Date: Thu, 11 Jun 2009 20:18:40 +0000 (-0400)
Subject: Minor change to fix a not so minor logic issue (potentially introduced through some... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=10d0f4b1047ea9eac0e4d2b6491f3b2537794015;p=xenclient%2Fioemu-pq.git

Minor change to fix a not so minor logic issue (potentially introduced through some merge).
---

diff --git a/master/battery-management b/master/battery-management
index 2a37b2b..4da956e 100644
--- a/master/battery-management
+++ b/master/battery-management
@@ -187,7 +187,7 @@ index c45bf9f..8c1debd 100644
                                           uint32_t build_nr);
  
 diff --git a/xenstore.c b/xenstore.c
-index 99b31fd..86deceb 100644
+index 99b31fd..96972d9 100644
 --- a/xenstore.c
 +++ b/xenstore.c
 @@ -27,6 +27,7 @@
@@ -198,7 +198,7 @@ index 99b31fd..86deceb 100644
  #include "qemu-timer.h"
  #include "qemu-xen.h"
  
-@@ -991,6 +992,25 @@ void xenstore_process_event(void *opaque)
+@@ -991,6 +992,26 @@ void xenstore_process_event(void *opaque)
          goto out;
      }
  
@@ -214,6 +214,7 @@ index 99b31fd..86deceb 100644
 +
 +    if (!strcmp(vec[XS_WATCH_TOKEN], "slpbuttonpressedevt")) {
 +        acpi_sleep_button_pressed();
++        goto out;
 +    }
 +
 +    if (!strcmp(vec[XS_WATCH_TOKEN], "lidstatechangeevt")) {
@@ -224,7 +225,7 @@ index 99b31fd..86deceb 100644
      if (strncmp(vec[XS_WATCH_TOKEN], "hd", 2) ||
          strlen(vec[XS_WATCH_TOKEN]) != 3)
          goto out;
-@@ -1373,6 +1393,20 @@ static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *le
+@@ -1373,6 +1394,20 @@ static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *le
      return value;
  }
  
@@ -245,7 +246,7 @@ index 99b31fd..86deceb 100644
  static int xenstore_extended_power_mgmt_write(const char *key, const char *value)
  {
      int ret;
-@@ -1425,6 +1459,37 @@ int xenstore_refresh_battery_status(void)
+@@ -1425,6 +1460,37 @@ int xenstore_refresh_battery_status(void)
      return xenstore_extended_power_mgmt_event_trigger("refreshbatterystatus", "1");
  }