8fa113bc65
- Update to libvirt 1.2.15
- Implement virDomainAddIOThread and virDomainDelIOThread
- libxl: Introduce configuration file for libxl driver
- Add VIR_DOMAIN_EVENT_ID_DEVICE_ADDED event
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Drop upstream patches da33a1ac-lxc-init-statedir.patch and
open-ns-files-readonly.patch
- spec file fixups for building --without-driver-modules
OBS-URL: https://build.opensuse.org/request/show/305342
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=456
56 lines
2.2 KiB
Diff
56 lines
2.2 KiB
Diff
Index: libvirt-1.2.15/src/qemu/qemu.conf
|
|
===================================================================
|
|
--- libvirt-1.2.15.orig/src/qemu/qemu.conf
|
|
+++ libvirt-1.2.15/src/qemu/qemu.conf
|
|
@@ -201,11 +201,20 @@
|
|
# isolation, but it cannot appear in a list of drivers.
|
|
#
|
|
#security_driver = "selinux"
|
|
+#security_driver = "apparmor"
|
|
|
|
# If set to non-zero, then the default security labeling
|
|
# will make guests confined. If set to zero, then guests
|
|
-# will be unconfined by default. Defaults to 1.
|
|
-#security_default_confined = 1
|
|
+# will be unconfined by default. Defaults to 0.
|
|
+#
|
|
+# SUSE Note:
|
|
+# Currently, Apparmor is the default security framework in SUSE
|
|
+# distros. If Apparmor is enabled on the host, libvirtd is
|
|
+# generously confined but users must opt-in to confine qemu
|
|
+# instances. Change this to a non-zero value to enable default
|
|
+# Apparmor confinement of qemu instances.
|
|
+#
|
|
+security_default_confined = 0
|
|
|
|
# If set to non-zero, then attempts to create unconfined
|
|
# guests will be blocked. Defaults to 0.
|
|
@@ -417,11 +426,22 @@
|
|
#allow_disk_format_probing = 1
|
|
|
|
|
|
-# In order to prevent accidentally starting two domains that
|
|
-# share one writable disk, libvirt offers two approaches for
|
|
-# locking files. The first one is sanlock, the other one,
|
|
-# virtlockd, is then our own implementation. Accepted values
|
|
-# are "sanlock" and "lockd".
|
|
+# SUSE note:
|
|
+# Two lock managers are supported: lockd and sanlock. lockd, which
|
|
+# is provided by the virtlockd service, uses advisory locks (flock(2))
|
|
+# to protect virtual machine disks. sanlock uses the notion of leases
|
|
+# to protect virtual machine disks and is more appropriate in a SAN
|
|
+# environment.
|
|
+#
|
|
+# For most deployments that require virtual machine disk protection,
|
|
+# lockd is recommended since it is easy to configure and the virtlockd
|
|
+# service can be restarted without terminating any running virtual
|
|
+# machines. sanlock, which may be preferred in some SAN environments,
|
|
+# has the disadvantage of not being able to be restarted without
|
|
+# first terminating all virtual machines for which it holds leases.
|
|
+#
|
|
+# Specify lockd or sanlock to enable protection of virtual machine disk
|
|
+# content.
|
|
#
|
|
#lock_manager = "lockd"
|
|
|