2015-01-28 05:12:58 +01:00
|
|
|
Index: libvirt-1.2.12/src/qemu/qemu.conf
|
2011-10-18 23:25:37 +02:00
|
|
|
===================================================================
|
2015-01-28 05:12:58 +01:00
|
|
|
--- libvirt-1.2.12.orig/src/qemu/qemu.conf
|
|
|
|
|
+++ libvirt-1.2.12/src/qemu/qemu.conf
|
2014-11-25 14:41:55 +01:00
|
|
|
@@ -204,7 +204,7 @@
|
2011-10-18 23:25:37 +02:00
|
|
|
|
2012-02-15 20:01:07 +01:00
|
|
|
# If set to non-zero, then the default security labeling
|
|
|
|
|
# will make guests confined. If set to zero, then guests
|
2014-11-25 14:41:55 +01:00
|
|
|
-# will be unconfined by default. Defaults to 1.
|
|
|
|
|
+# will be unconfined by default. Defaults to 0.
|
|
|
|
|
#security_default_confined = 1
|
|
|
|
|
|
|
|
|
|
# If set to non-zero, then attempts to create unconfined
|
|
|
|
|
@@ -417,11 +417,22 @@
|
2012-06-20 02:00:14 +02:00
|
|
|
#allow_disk_format_probing = 1
|
|
|
|
|
|
2012-02-16 18:05:01 +01:00
|
|
|
|
2014-04-02 14:48:46 +02:00
|
|
|
-# 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".
|
2012-02-16 18:05:01 +01:00
|
|
|
+# SUSE note:
|
2014-03-04 20:05:01 +01:00
|
|
|
+# 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.
|
2012-02-16 18:05:01 +01:00
|
|
|
+#
|
2014-03-04 20:05:01 +01:00
|
|
|
+# 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.
|
|
|
|
|
+#
|
2014-04-02 14:48:46 +02:00
|
|
|
+# Specify lockd or sanlock to enable protection of virtual machine disk
|
|
|
|
|
+# content.
|
2014-03-04 20:05:01 +01:00
|
|
|
#
|
2014-04-02 14:48:46 +02:00
|
|
|
#lock_manager = "lockd"
|
2014-03-04 20:05:01 +01:00
|
|
|
|
2015-01-28 05:12:58 +01:00
|
|
|
Index: libvirt-1.2.12/src/qemu/qemu_conf.c
|
2014-11-25 14:41:55 +01:00
|
|
|
===================================================================
|
2015-01-28 05:12:58 +01:00
|
|
|
--- libvirt-1.2.12.orig/src/qemu/qemu_conf.c
|
|
|
|
|
+++ libvirt-1.2.12/src/qemu/qemu_conf.c
|
2014-11-25 14:41:55 +01:00
|
|
|
@@ -249,7 +249,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
|
|
|
|
|
|
|
|
|
|
cfg->clearEmulatorCapabilities = true;
|
|
|
|
|
|
|
|
|
|
- cfg->securityDefaultConfined = true;
|
|
|
|
|
+ cfg->securityDefaultConfined = false;
|
|
|
|
|
cfg->securityRequireConfined = false;
|
|
|
|
|
|
|
|
|
|
cfg->keepAliveInterval = 5;
|
