On 05/25/2012 06:36 AM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Instead of doing
# example_config
use
#example_config
so it is possible to programatically uncomment example config
options, as distinct from their comment/descriptions
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
daemon/libvirtd.conf | 13 +++++-----
src/lxc/lxc.conf | 8 +++---
src/qemu/qemu.conf | 66 +++++++++++++++++++++++++-------------------------
3 files changed, 43 insertions(+), 44 deletions(-)
Mechanical, and very nice. ACK with nits fixed:
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
index 50eda1b..aa3fa2e 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -303,10 +303,9 @@
# Multiple filter can be defined in a single @filters, they just need to be
# separated by spaces.
#
-# e.g:
-# log_filters="3:remote 4:event"
-# to only get warning or errors from the remote layer and only errors from
-# the event layer.
+# e.g: to only get warning or errors from the remote layer and only errors
+# from the event layer
s/$/:/, to match...
+#log_filters="3:remote 4:event"
# Logging outputs:
# An output is one of the places to save logging information
@@ -324,9 +323,9 @@
# 4: ERROR
#
# Multiple output can be defined, they just need to be separated by spaces.
-# e.g.:
-# log_outputs="3:syslog:libvirtd"
-# to log all warnings and errors to syslog under the libvirtd ident
+# e.g. to log all warnings and errors to syslog under the libvirtd ident:
this line.
+#log_outputs="3:syslog:libvirtd"
+#
@@ -178,7 +178,7 @@
# can be mounted in different locations. libvirt will detect
# where they are located.
#
-# cgroup_controllers = [ "cpu", "devices", "memory",
"blkio", "cpuset", "cpuacct" ]
+#cgroup_controllers = [ "cpu", "devices", "memory",
"blkio", "cpuset", "cpuacct" ]
# This is the basic set of devices allowed / required by
# all virtual machines.
@@ -193,7 +193,7 @@
# "/dev/null", "/dev/full", "/dev/zero",
# "/dev/random", "/dev/urandom",
# "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
-# "/dev/rtc", "/dev/hpet",
+# "/dev/rtc","/dev/hpet"
#]
Deleting a trailing comma seems unrelated. Any reason to keep this
change, and should the commit message mention it?
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org