← Back to branch summary

~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to src/qemu/qemu.conf

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qemu/qemu.conf
138
138
#
139
139
# security_driver = "selinux"
140
140
 
 
141
# If set to non-zero, then the default security labeling
 
142
# will make guests confined. If set to zero, then guests
 
143
# will be unconfined by default. Defaults to 1.
 
144
# security_default_confined = 1
 
145
 
 
146
# If set to non-zero, then attempts to create unconfined
 
147
# guests will be blocked. Defaults to 0.
 
148
# security_require_confined = 1
141
149
 
142
150
# The user ID for QEMU processes run by the system instance.
143
151
#user = "root"
158
166
#  - 'memory' - use for memory tunables
159
167
#  - 'blkio' - use for block devices I/O tunables
160
168
#  - 'cpuset' - use for CPUs and memory nodes
 
169
#  - 'cpuacct' - use for CPUs statistics.
161
170
#
162
171
# NB, even if configured here, they won't be used unless
163
172
# the administrator has mounted cgroups, e.g.:
169
178
# can be mounted in different locations. libvirt will detect
170
179
# where they are located.
171
180
#
172
 
# cgroup_controllers = [ "cpu", "devices", "memory", "blkio", "cpuset" ]
 
181
# cgroup_controllers = [ "cpu", "devices", "memory", "blkio", "cpuset", "cpuacct" ]
173
182
 
174
183
# This is the basic set of devices allowed / required by
175
184
# all virtual machines.
299
308
# set_process_name = 1
300
309
 
301
310
 
302
 
# If max_processes is set to a positive integer, libvirt will use it to set
303
 
# maximum number of processes that can be run by qemu user. This can be used to
304
 
# override default value set by host OS.
 
311
# If max_processes is set to a positive integer, libvirt will use
 
312
# it to set the maximum number of processes that can be run by qemu
 
313
# user. This can be used to override default value set by host OS.
 
314
# The same applies to max_files which sets the limit on the maximum
 
315
# number of opened files.
305
316
#
306
317
# max_processes = 0
 
318
# max_files = 0
307
319
 
308
320
# To enable 'Sanlock' project based locking of the file
309
321
# content (to prevent two VMs writing to the same