diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 5ad956740fd3e3ef5a18584aba2ee6f344e00a9c..0218b5a7a946d35919053a4e6182be7a1f8b9054 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -395,7 +395,7 @@ chmod o+x /path/to/directory
 /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/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2ae5006849a4fd401bfde22da0df7b3d808e7131..7882c54bc184ca08499566a05f05ed37edeaf0da 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -22,7 +22,7 @@ type 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 id 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 7820e72dd88c08fa21d605fb11d87df994f9f9cd..334b4cd4ee950488c31074f7c07eddad0bfe139c 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 e88cb8c45f4d6d5e0adafa81bf8b64941f769799..c23f0af2aab49b5c06c84b2236f8090eae1e724f 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 024ee5b62de026dbe414b00575047f988155e126..5118f4ad42f465019a6de37fbd628536943f8365 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 51a7ad58926d890dc1bac81260aa2887feed6941..fea1d308b71935546614b872cd988a52a36ba5bc 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 eaa5167525a2167075d10797c619dcbdda110732..7d28faa1636cde34cbf79d1e903abfbdc380d696 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