From 060e07c3caa1fbc274fffd9f8a424c61ccb01ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Mon, 18 Feb 2019 16:13:30 +0100
Subject: [PATCH] Remove remaining references to kqemu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We dropped support in commit 8e91a40 (November 2015), but some
occurrences still remained, even in live code.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reported-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---
 docs/drvqemu.html.in               | 2 +-
 docs/formatdomain.html.in          | 2 +-
 src/qemu/qemu.conf                 | 2 +-
 src/qemu/qemu_cgroup.c             | 2 +-
 src/qemu/qemu_driver.c             | 3 ---
 src/qemu/test_libvirtd_qemu.aug.in | 5 ++---
 src/security/apparmor/libvirt-qemu | 1 -
 7 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
index 5ad956740f..0218b5a7a9 100644
--- a/docs/drvqemu.html.in
+++ b/docs/drvqemu.html.in
@@ -395,7 +395,7 @@ chmod o+x /path/to/directory
 <pre>
 /dev/null, /dev/full, /dev/zero,
 /dev/random, /dev/urandom,
-/dev/ptmx, /dev/kvm, /dev/kqemu,
+/dev/ptmx, /dev/kvm,
 /dev/rtc, /dev/hpet
 </pre>
 
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 2ae5006849..7882c54bc1 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -22,7 +22,7 @@
       <a id="attributeDomainType"><code>type</code></a>
       specifies the hypervisor used for running
       the domain. The allowed values are driver specific, but
-      include "xen", "kvm", "qemu", "lxc" and "kqemu". The
+      include "xen", "kvm", "qemu" and "lxc". The
       second attribute is <code>id</code> which is a unique
       integer identifier for the running guest machine. Inactive
       machines have no id value.
diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index 7820e72dd8..334b4cd4ee 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -489,7 +489,7 @@
 #cgroup_device_acl = [
 #    "/dev/null", "/dev/full", "/dev/zero",
 #    "/dev/random", "/dev/urandom",
-#    "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
+#    "/dev/ptmx", "/dev/kvm",
 #    "/dev/rtc","/dev/hpet"
 #]
 #
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index e88cb8c45f..c23f0af2aa 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -45,7 +45,7 @@ VIR_LOG_INIT("qemu.qemu_cgroup");
 const char *const defaultDeviceACL[] = {
     "/dev/null", "/dev/full", "/dev/zero",
     "/dev/random", "/dev/urandom",
-    "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
+    "/dev/ptmx", "/dev/kvm",
     "/dev/rtc", "/dev/hpet",
     NULL,
 };
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 024ee5b62d..5118f4ad42 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1260,9 +1260,6 @@ qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type)
     if (STRCASEEQ(type, "kvm"))
         return virHostCPUGetKVMMaxVCPUs();
 
-    if (STRCASEEQ(type, "kqemu"))
-        return 1;
-
     virReportError(VIR_ERR_INVALID_ARG,
                    _("unknown type '%s'"), type);
     return -1;
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
index 51a7ad5892..fea1d308b7 100644
--- a/src/qemu/test_libvirtd_qemu.aug.in
+++ b/src/qemu/test_libvirtd_qemu.aug.in
@@ -60,9 +60,8 @@ module Test_libvirtd_qemu =
     { "5" = "/dev/urandom" }
     { "6" = "/dev/ptmx" }
     { "7" = "/dev/kvm" }
-    { "8" = "/dev/kqemu" }
-    { "9" = "/dev/rtc" }
-    { "10" = "/dev/hpet" }
+    { "8" = "/dev/rtc" }
+    { "9" = "/dev/hpet" }
 }
 { "save_image_format" = "raw" }
 { "dump_image_format" = "raw" }
diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
index eaa5167525..7d28faa163 100644
--- a/src/security/apparmor/libvirt-qemu
+++ b/src/security/apparmor/libvirt-qemu
@@ -23,7 +23,6 @@
   /dev/net/tun rw,
   /dev/kvm rw,
   /dev/ptmx rw,
-  /dev/kqemu rw,
   @{PROC}/*/status r,
   # When qemu is signaled to terminate, it will read cmdline of signaling
   # process for reporting purposes. Allowing read access to a process