|
 |
9c6c51 |
From 17c0f51fb9981dbd372a24952b483a14222674ec Mon Sep 17 00:00:00 2001
|
|
|
9c6c51 |
Message-Id: <17c0f51fb9981dbd372a24952b483a14222674ec@dist-git>
|
|
|
9c6c51 |
From: Erik Skultety <eskultet@redhat.com>
|
|
|
9c6c51 |
Date: Fri, 1 Feb 2019 17:21:54 +0100
|
|
|
9c6c51 |
Subject: [PATCH] qemu: conf: Remove /dev/sev from the default cgroup device
|
|
|
9c6c51 |
acl list
|
|
|
9c6c51 |
MIME-Version: 1.0
|
|
|
9c6c51 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9c6c51 |
Content-Transfer-Encoding: 8bit
|
|
|
9c6c51 |
|
|
|
9c6c51 |
We should not give domains access to something they don't necessarily
|
|
|
9c6c51 |
need by default. Remove it from the qemu driver docs too.
|
|
|
9c6c51 |
|
|
|
9c6c51 |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
9c6c51 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
9c6c51 |
(cherry picked from commit b6440119185a4e307654a8d26d6d551a2675bf82)
|
|
|
9c6c51 |
|
|
|
9c6c51 |
https: //bugzilla.redhat.com/show_bug.cgi?id=1665400
|
|
|
9c6c51 |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
9c6c51 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9c6c51 |
---
|
|
|
9c6c51 |
docs/drvqemu.html.in | 2 +-
|
|
|
9c6c51 |
src/qemu/qemu.conf | 2 +-
|
|
|
9c6c51 |
src/qemu/qemu_cgroup.c | 2 +-
|
|
|
9c6c51 |
src/qemu/test_libvirtd_qemu.aug.in | 1 -
|
|
|
9c6c51 |
4 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
9c6c51 |
|
|
|
9c6c51 |
diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
|
|
|
9c6c51 |
index d51ccf2412..a692a6dab6 100644
|
|
|
9c6c51 |
--- a/docs/drvqemu.html.in
|
|
|
9c6c51 |
+++ b/docs/drvqemu.html.in
|
|
|
9c6c51 |
@@ -396,7 +396,7 @@ chmod o+x /path/to/directory
|
|
|
9c6c51 |
/dev/null, /dev/full, /dev/zero,
|
|
|
9c6c51 |
/dev/random, /dev/urandom,
|
|
|
9c6c51 |
/dev/ptmx, /dev/kvm, /dev/kqemu,
|
|
|
9c6c51 |
-/dev/rtc, /dev/hpet, /dev/sev
|
|
|
9c6c51 |
+/dev/rtc, /dev/hpet
|
|
|
9c6c51 |
|
|
|
9c6c51 |
|
|
|
9c6c51 |
|
|
|
9c6c51 |
diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
|
|
|
9c6c51 |
index cd57b3cc69..76afe88b0c 100644
|
|
|
9c6c51 |
--- a/src/qemu/qemu.conf
|
|
|
9c6c51 |
+++ b/src/qemu/qemu.conf
|
|
|
9c6c51 |
@@ -485,7 +485,7 @@
|
|
|
9c6c51 |
# "/dev/null", "/dev/full", "/dev/zero",
|
|
|
9c6c51 |
# "/dev/random", "/dev/urandom",
|
|
|
9c6c51 |
# "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
|
|
|
9c6c51 |
-# "/dev/rtc","/dev/hpet", "/dev/sev"
|
|
|
9c6c51 |
+# "/dev/rtc","/dev/hpet"
|
|
|
9c6c51 |
#]
|
|
|
9c6c51 |
#
|
|
|
9c6c51 |
# RDMA migration requires the following extra files to be added to the list:
|
|
|
9c6c51 |
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
|
|
|
9c6c51 |
index c8fba7f9e6..fd54333fb9 100644
|
|
|
9c6c51 |
--- a/src/qemu/qemu_cgroup.c
|
|
|
9c6c51 |
+++ b/src/qemu/qemu_cgroup.c
|
|
|
9c6c51 |
@@ -48,7 +48,7 @@ const char *const defaultDeviceACL[] = {
|
|
|
9c6c51 |
"/dev/null", "/dev/full", "/dev/zero",
|
|
|
9c6c51 |
"/dev/random", "/dev/urandom",
|
|
|
9c6c51 |
"/dev/ptmx", "/dev/kvm", "/dev/kqemu",
|
|
|
9c6c51 |
- "/dev/rtc", "/dev/hpet", "/dev/sev",
|
|
|
9c6c51 |
+ "/dev/rtc", "/dev/hpet",
|
|
|
9c6c51 |
NULL,
|
|
|
9c6c51 |
};
|
|
|
9c6c51 |
#define DEVICE_PTY_MAJOR 136
|
|
|
9c6c51 |
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
9c6c51 |
index f1e8806ad2..61690ee92c 100644
|
|
|
9c6c51 |
--- a/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
9c6c51 |
+++ b/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
9c6c51 |
@@ -62,7 +62,6 @@ module Test_libvirtd_qemu =
|
|
|
9c6c51 |
{ "8" = "/dev/kqemu" }
|
|
|
9c6c51 |
{ "9" = "/dev/rtc" }
|
|
|
9c6c51 |
{ "10" = "/dev/hpet" }
|
|
|
9c6c51 |
- { "11" = "/dev/sev" }
|
|
|
9c6c51 |
}
|
|
|
9c6c51 |
{ "save_image_format" = "raw" }
|
|
|
9c6c51 |
{ "dump_image_format" = "raw" }
|
|
|
9c6c51 |
--
|
|
|
9c6c51 |
2.20.1
|
|
|
9c6c51 |
|