qemu: Temporary disable owner remembering

Turns out, that there are few bugs that are not that trivial to
fix (e.g. around block jobs). Instead of rushing in not
thoroughly tested fixes disable the feature temporarily for the
release.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
ACKed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/docs/news.xml b/docs/news.xml
index 90b7e8891ef73fa59ab389ff55f382684bda220f..c7a4dde463c5147560660f0723f4102aa6e1cd3f 100644 (file)
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -66,19 +66,6 @@
           qemu: Add support for ARMv6l guests
         </summary>
       </change>
-      <change>
-        <summary>
-          Remember original owners and SELinux labels of files
-        </summary>
-        <description>
-          When a domain is starting up libvirt changes DAC and
-          SELinux labels so that domain can access it. However,
-          it never remembered the original labels and therefore
-          the file was returned back to <code>root:root</code>.
-          With this release, the original labels are remembered
-          and restored properly.
-        </description>
-      </change>
       <change>
         <summary>
           Support more NVDIMM configuration options

diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 8a5b39e568c87c07c4ead13e87954662f9d31489..ddc4bbfd1d7cfec40f92602d1e54e8b7e95027d7 100644 (file)
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -71,7 +71,6 @@ module Libvirtd_qemu =
                  | str_entry "user"
                  | str_entry "group"
                  | bool_entry "dynamic_ownership"
-                 | bool_entry "remember_owner"
                  | str_array_entry "cgroup_controllers"
                  | str_array_entry "cgroup_device_acl"
                  | int_entry "seccomp_sandbox"

diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index 29093f63296b4d7a7051f230e9a69c4217e36272..28e51b2c59a1fd8754fb348b304273230b8cc879 100644 (file)
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -450,11 +450,6 @@
 # Set to 0 to disable file ownership changes.
 #dynamic_ownership = 1
 
-# Whether libvirt should remember and restore the original
-# ownership over files it is relabeling. Defaults to 1, set
-# to 0 to disable the feature.
-#remember_owner = 1
-
 # What cgroup controllers to make use of with QEMU guests
 #
 #  - 'cpu' - use for scheduler tunables

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 20952e9607f2a53832ea2bf8210671c1e2391c80..b03e38b83101a84bbe0a2702c583e8b0a082d9a5 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -145,7 +145,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
         cfg->group = (gid_t)-1;
     }
     cfg->dynamicOwnership = privileged;
-    cfg->rememberOwner = privileged;
 
     cfg->cgroupControllers = -1; /* -1 == auto-detect */
 
@@ -729,9 +728,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
     if (virConfGetValueBool(conf, "dynamic_ownership", &cfg->dynamicOwnership) < 0)
         goto cleanup;
 
-    if (virConfGetValueBool(conf, "remember_owner", &cfg->rememberOwner) < 0)
-        goto cleanup;
-
     if (virConfGetValueStringList(conf,  "cgroup_controllers", false,
                                   &controllers) < 0)
         goto cleanup;

diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
index 92a8ae1192208bdd78f4c89f3c00b17ab80e455a..f1e8806ad20db1fcf21f20f19588c18865b95889 100644 (file)
--- a/src/qemu/test_libvirtd_qemu.aug.in
+++ b/src/qemu/test_libvirtd_qemu.aug.in
@@ -43,7 +43,6 @@ module Test_libvirtd_qemu =
 { "user" = "root" }
 { "group" = "root" }
 { "dynamic_ownership" = "1" }
-{ "remember_owner" = "1" }
 { "cgroup_controllers"
     { "1" = "cpu" }
     { "2" = "devices" }