2016-06-15 21:29:46 +02:00
|
|
|
SUSE adjustments to qemu.conf
|
|
|
|
|
|
|
|
|
|
This patch contains SUSE-specific adjustments to the upstream
|
|
|
|
|
qemu.conf configuration file. In the future, it might make
|
|
|
|
|
sense to separate these changes into individual patches (e.g.
|
|
|
|
|
suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch,
|
|
|
|
|
etc.), but for now they are all lumped together in this
|
|
|
|
|
single patch.
|
|
|
|
|
|
Accepting request 400351 from home:jfehlig:branches:Virtualization
- Update to libvirt 1.3.5
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
e4d131b8-mv-virDomainDefPostParseInternal.patch,
3e428670-post-parse-implicit-video.patch,
538012c8-default-vram.patch, 96b21fb0-vram-tests.patch,
400e716d-libxl-noprope-emulator.patch,
b90c4b5f-tests-use-qemu-xen.patch,
fccf2725-libxl-API-4.4.patch,
5325123d-libxl-migv2-save-restore.patch,
f9edcfa4-libxl-migv2-migration.patch,
a1c9a81a-libxl-rbd-fix.patch,
ba566428-libxl-dom-iface-addrs.patch
- spec: simplify and cleanup by removing many conditionals that
are never toogled. Also drop conditionals for suse_version <
1310
OBS-URL: https://build.opensuse.org/request/show/400351
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=538
2016-06-07 04:00:39 +02:00
|
|
|
Index: libvirt-1.3.5/src/qemu/qemu.conf
|
2011-10-18 23:25:37 +02:00
|
|
|
===================================================================
|
Accepting request 400351 from home:jfehlig:branches:Virtualization
- Update to libvirt 1.3.5
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
e4d131b8-mv-virDomainDefPostParseInternal.patch,
3e428670-post-parse-implicit-video.patch,
538012c8-default-vram.patch, 96b21fb0-vram-tests.patch,
400e716d-libxl-noprope-emulator.patch,
b90c4b5f-tests-use-qemu-xen.patch,
fccf2725-libxl-API-4.4.patch,
5325123d-libxl-migv2-save-restore.patch,
f9edcfa4-libxl-migv2-migration.patch,
a1c9a81a-libxl-rbd-fix.patch,
ba566428-libxl-dom-iface-addrs.patch
- spec: simplify and cleanup by removing many conditionals that
are never toogled. Also drop conditionals for suse_version <
1310
OBS-URL: https://build.opensuse.org/request/show/400351
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=538
2016-06-07 04:00:39 +02:00
|
|
|
--- libvirt-1.3.5.orig/src/qemu/qemu.conf
|
|
|
|
|
+++ libvirt-1.3.5/src/qemu/qemu.conf
|
2015-03-11 16:35:20 +01:00
|
|
|
@@ -201,11 +201,20 @@
|
|
|
|
|
# isolation, but it cannot appear in a list of drivers.
|
|
|
|
|
#
|
|
|
|
|
#security_driver = "selinux"
|
|
|
|
|
+#security_driver = "apparmor"
|
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.
|
2015-03-11 16:35:20 +01:00
|
|
|
-#security_default_confined = 1
|
2014-11-25 14:41:55 +01:00
|
|
|
+# will be unconfined by default. Defaults to 0.
|
2015-03-11 16:35:20 +01:00
|
|
|
+#
|
|
|
|
|
+# 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
|
2014-11-25 14:41:55 +01:00
|
|
|
|
|
|
|
|
# If set to non-zero, then attempts to create unconfined
|
2015-03-11 16:35:20 +01:00
|
|
|
# guests will be blocked. Defaults to 0.
|
|
|
|
|
@@ -417,11 +426,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
|
|
|
|
2016-06-15 21:29:46 +02:00
|
|
|
@@ -512,8 +532,8 @@
|
|
|
|
|
# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
|
|
|
|
|
# follows this scheme.
|
|
|
|
|
#nvram = [
|
|
|
|
|
-# "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd",
|
|
|
|
|
-# "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd"
|
|
|
|
|
+# "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin",
|
|
|
|
|
+# "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
|
|
|
|
|
#]
|
|
|
|
|
|
|
|
|
|
# The backend to use for handling stdout/stderr output from
|
