Minor refactoring to consolidate power management changes to a single patch.

diff --git a/master/battery-management b/master/battery-management
index 4da956e7efcf25464255c617df07febd2dd19d23..7fdc062d344bf65d612bb5d3a596f22056086628 100644 (file)
--- a/master/battery-management
+++ b/master/battery-management
@@ -170,10 +170,10 @@ index 7844cb8..c218782 100644
  {
  #if defined(DEBUG)
 diff --git a/qemu-xen.h b/qemu-xen.h
-index c45bf9f..8c1debd 100644
+index 395b7c9..b2832e3 100644
 --- a/qemu-xen.h
 +++ b/qemu-xen.h
-@@ -122,8 +122,12 @@ void xenstore_dm_finished_startup(void);
+@@ -124,8 +124,12 @@ void xenstore_dm_finished_startup(void);
  int xenstore_vm_write(int domid, const char *key, const char *val);
  char *xenstore_vm_read(int domid, const char *key, unsigned int *len);
  char *xenstore_device_model_read(int domid, const char *key, unsigned int *len);
@@ -187,7 +187,7 @@ index c45bf9f..8c1debd 100644
                                           uint32_t build_nr);
  
 diff --git a/xenstore.c b/xenstore.c
-index 99b31fd..96972d9 100644
+index 99b31fd..635d9e3 100644
 --- a/xenstore.c
 +++ b/xenstore.c
 @@ -27,6 +27,7 @@
@@ -225,7 +225,24 @@ index 99b31fd..96972d9 100644
      if (strncmp(vec[XS_WATCH_TOKEN], "hd", 2) ||
          strlen(vec[XS_WATCH_TOKEN]) != 3)
          goto out;
-@@ -1373,6 +1394,20 @@ static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *le
+@@ -1358,7 +1379,7 @@ char *xenstore_device_model_read(int domid, const char *key, unsigned int *len)
+     return value;
+ }
+ 
+-static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *len)
++static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *len, int carp)
+ {
+     char *path = NULL, *value = NULL;
+     
+@@ -1366,13 +1387,27 @@ static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *le
+         return NULL;
+ 
+     value = xs_read(xsh, XBT_NULL, path, len);
+-    if (value == NULL)
++    if (value == NULL && carp)
+         fprintf(logfile, "xs_read(%s): read error\n", path);
+ 
+     free(path);
      return value;
  }
  
@@ -234,7 +251,7 @@ index 99b31fd..96972d9 100644
 +    int value = default_value;
 +    char *buffer;
 +
-+    buffer = xenstore_extended_power_mgmt_read(key, NULL);
++    buffer = xenstore_extended_power_mgmt_read(key, NULL, 1);
 +    if ( buffer == NULL )
 +        return value;
 +
@@ -246,6 +263,18 @@ index 99b31fd..96972d9 100644
  static int xenstore_extended_power_mgmt_write(const char *key, const char *value)
  {
      int ret;
+@@ -1409,9 +1444,9 @@ xenstore_extended_power_mgmt_event_trigger(const char *key, const char *value)
+ char *xenstore_read_battery_data(int battery_status)
+ {
+     if ( battery_status == 1 )
+-        return xenstore_extended_power_mgmt_read("bst", NULL);
++        return xenstore_extended_power_mgmt_read("bst", NULL, 1);
+     else
+-        return xenstore_extended_power_mgmt_read("bif", NULL);
++        return xenstore_extended_power_mgmt_read("bif", NULL, 0);
+ }
+ 
+ /*
 @@ -1425,6 +1460,37 @@ int xenstore_refresh_battery_status(void)
      return xenstore_extended_power_mgmt_event_trigger("refreshbatterystatus", "1");
  }

diff --git a/master/dont-carp-about-a-missing-battery b/master/dont-carp-about-a-missing-battery
deleted file mode 100644 (file)
index e9711a9..0000000
--- a/master/dont-carp-about-a-missing-battery
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/xenstore.c b/xenstore.c
-index a298f40..85d1f0a 100644
---- a/xenstore.c
-+++ b/xenstore.c
-@@ -1384,7 +1384,7 @@ char *xenstore_device_model_read(int domid, const char *key, unsigned int *len)
-     return value;
- }
- 
--static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *len)
-+static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *len, int carp)
- {
-     char *path = NULL, *value = NULL;
-     
-@@ -1392,7 +1392,7 @@ static char *xenstore_extended_power_mgmt_read(const char *key, unsigned int *le
-         return NULL;
- 
-     value = xs_read(xsh, XBT_NULL, path, len);
--    if (value == NULL)
-+    if (value == NULL && carp)
-         fprintf(logfile, "xs_read(%s): read error\n", path);
- 
-     free(path);
-@@ -1404,7 +1404,7 @@ int xenstore_extended_power_mgmt_read_int(const char *key, int default_value)
-     int value = default_value;
-     char *buffer;
- 
--    buffer = xenstore_extended_power_mgmt_read(key, NULL);
-+    buffer = xenstore_extended_power_mgmt_read(key, NULL, 1);
-     if ( buffer == NULL )
-         return value;
- 
-@@ -1449,9 +1449,9 @@ xenstore_extended_power_mgmt_event_trigger(const char *key, const char *value)
- char *xenstore_read_battery_data(int battery_status)
- {
-     if ( battery_status == 1 )
--        return xenstore_extended_power_mgmt_read("bst", NULL);
-+        return xenstore_extended_power_mgmt_read("bst", NULL, 1);
-     else
--        return xenstore_extended_power_mgmt_read("bif", NULL);
-+        return xenstore_extended_power_mgmt_read("bif", NULL, 0);
- }
- 
- /*

diff --git a/master/series b/master/series
index 836f8b8b2acf4c6f0e2564cf14a83bff782acf5b..9abe27c21011cebb295689cf5e38336ee98653e0 100644 (file)
--- a/master/series
+++ b/master/series
@@ -28,7 +28,6 @@ atapi-pass-through
 do-atapi-locking-properly
 atapi-succeed-on-lock-door
 pv_driver_throttling_disabled
-dont-carp-about-a-missing-battery
 vga-clear-hw-fb-on-resize
 hide-msi-capability-for-igfx
 vga-edid