From d10cc97cbb826099530180450052f90b86cdcac8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 10 Oct 2013 15:20:18 +0200
Subject: Remove QoS interface

It was added for some workloads, but ill-suited and never really
got traction. Using cgroups to manage the resources of particular
services (using systemd), or something separate like rtkit is
a better bet.
---
 doc/Makefile.am       | 2 --
 doc/dbus/Makefile.am  | 6 +-----
 doc/upower-docs.xml   | 2 --
 doc/website/index.htm | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'doc')

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8f01af5..05cfa4f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -60,7 +60,6 @@ content_files =  			    				\
 	man/UPower.xml		    					\
 	dbus/org.freedesktop.UPower.ref.xml				\
 	dbus/org.freedesktop.UPower.Device.ref.xml			\
-	dbus/org.freedesktop.UPower.QoS.ref.xml				\
 	dbus/org.freedesktop.UPower.KbdBacklight.ref.xml		\
 	$(NULL)
 
@@ -80,7 +79,6 @@ MAINTAINERCLEANFILES =		\
 DISTCLEANFILES =					\
 	org.freedesktop.UPower.Device.ref.xml		\
 	org.freedesktop.UPower.KbdBacklight.ref.xml	\
-	org.freedesktop.UPower.QoS.ref.xml		\
 	org.freedesktop.UPower.ref.xml			\
 	upowerd.xml					\
 	upower.xml					\
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
index 2061cb9..4ac2710 100644
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -1,5 +1,5 @@
 
-all : org.freedesktop.UPower.ref.xml org.freedesktop.UPower.Device.ref.xml org.freedesktop.UPower.QoS.ref.xml org.freedesktop.UPower.KbdBacklight.ref.xml org.freedesktop.UPower.Wakeups.ref.xml
+all : org.freedesktop.UPower.ref.xml org.freedesktop.UPower.Device.ref.xml org.freedesktop.UPower.KbdBacklight.ref.xml org.freedesktop.UPower.Wakeups.ref.xml
 
 org.freedesktop.UPower.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
@@ -9,10 +9,6 @@ org.freedesktop.UPower.Device.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
 
-org.freedesktop.UPower.QoS.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.QoS.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
-	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
-
 org.freedesktop.UPower.KbdBacklight.ref.xml : $(top_srcdir)/src/org.freedesktop.UPower.KbdBacklight.xml $(top_srcdir)/doc/dbus/spec-to-docbook.xsl
 	echo "<?xml version=\"1.0\"?>""<!DOCTYPE refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">" > $@
 	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 >> $@
diff --git a/doc/upower-docs.xml b/doc/upower-docs.xml
index 15b99a3..cc5f890 100644
--- a/doc/upower-docs.xml
+++ b/doc/upower-docs.xml
@@ -66,7 +66,6 @@
     </partintro>
     <xi:include href="dbus/org.freedesktop.UPower.ref.xml"/>
     <xi:include href="dbus/org.freedesktop.UPower.Device.ref.xml"/>
-    <xi:include href="dbus/org.freedesktop.UPower.QoS.ref.xml"/>
     <xi:include href="dbus/org.freedesktop.UPower.KbdBacklight.ref.xml"/>
   </reference>
 
@@ -80,7 +79,6 @@
     <xi:include href="xml/up-client.xml"/>
     <xi:include href="xml/up-device.xml"/>
     <xi:include href="xml/up-history-item.xml"/>
-    <xi:include href="xml/up-qos-item.xml"/>
     <xi:include href="xml/up-stats-item.xml"/>
     <xi:include href="xml/up-wakeup-item.xml"/>
   </reference>
diff --git a/doc/website/index.htm b/doc/website/index.htm
index 87f6964..b97414b 100644
--- a/doc/website/index.htm
+++ b/doc/website/index.htm
@@ -16,7 +16,6 @@ UPower is an abstraction for enumerating power devices,
 listening to device events and querying history and statistics.
 Any application or service on the system can access the
 <code>org.freedesktop.UPower</code> service via the system message bus.
-Some operations (such as setting the QoS for the system) are restricted using <a href="http://hal.freedesktop.org/docs/PolicyKit/">PolicyKit</a>.
 </p>
 <p>
 UPower was <a href="http://lists.freedesktop.org/archives/devkit-devel/2009-December/000567.html">
-- 
cgit v1.2.1