openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove remaining references to kqemu 

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>
This commit is contained in:
Ján Tomko 2019-02-18 16:13:30 +01:00
parent 1e5634ec79
commit 060e07c3ca
7 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/drvqemu.html.in
View File

@ -395,7 +395,7 @@ chmod o+x /path/to/directory
<pre> <pre>
/dev/null, /dev/full, /dev/zero, /dev/null, /dev/full, /dev/zero,
/dev/random, /dev/urandom, /dev/random, /dev/urandom,
/dev/ptmx, /dev/kvm, /dev/kqemu, /dev/ptmx, /dev/kvm,
/dev/rtc, /dev/hpet /dev/rtc, /dev/hpet
</pre> </pre>

2
docs/formatdomain.html.in
View File

@ -22,7 +22,7 @@
<a id="attributeDomainType"><code>type</code></a> <a id="attributeDomainType"><code>type</code></a>
specifies the hypervisor used for running specifies the hypervisor used for running
the domain. The allowed values are driver specific, but 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 second attribute is <code>id</code> which is a unique
integer identifier for the running guest machine. Inactive integer identifier for the running guest machine. Inactive
machines have no id value. machines have no id value.

2
src/qemu/qemu.conf
View File

@ -489,7 +489,7 @@
#cgroup_device_acl = [ #cgroup_device_acl = [
# "/dev/null", "/dev/full", "/dev/zero", # "/dev/null", "/dev/full", "/dev/zero",
# "/dev/random", "/dev/urandom", # "/dev/random", "/dev/urandom",
# "/dev/ptmx", "/dev/kvm", "/dev/kqemu", # "/dev/ptmx", "/dev/kvm",
# "/dev/rtc","/dev/hpet" # "/dev/rtc","/dev/hpet"
#] #]
# #

2
src/qemu/qemu_cgroup.c
View File

@ -45,7 +45,7 @@ VIR_LOG_INIT("qemu.qemu_cgroup");
const char *const defaultDeviceACL[] = { const char *const defaultDeviceACL[] = {
"/dev/null", "/dev/full", "/dev/zero", "/dev/null", "/dev/full", "/dev/zero",
"/dev/random", "/dev/urandom", "/dev/random", "/dev/urandom",
"/dev/ptmx", "/dev/kvm", "/dev/kqemu", "/dev/ptmx", "/dev/kvm",
"/dev/rtc", "/dev/hpet", "/dev/rtc", "/dev/hpet",
NULL, NULL,
}; };

3
src/qemu/qemu_driver.c
View File

@ -1260,9 +1260,6 @@ qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type)
if (STRCASEEQ(type, "kvm")) if (STRCASEEQ(type, "kvm"))
return virHostCPUGetKVMMaxVCPUs(); return virHostCPUGetKVMMaxVCPUs();
if (STRCASEEQ(type, "kqemu"))
return 1;
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("unknown type '%s'"), type); _("unknown type '%s'"), type);
return -1; return -1;

5
src/qemu/test_libvirtd_qemu.aug.in
View File

@ -60,9 +60,8 @@ module Test_libvirtd_qemu =
{ "5" = "/dev/urandom" } { "5" = "/dev/urandom" }
{ "6" = "/dev/ptmx" } { "6" = "/dev/ptmx" }
{ "7" = "/dev/kvm" } { "7" = "/dev/kvm" }
{ "8" = "/dev/kqemu" } { "8" = "/dev/rtc" }
{ "9" = "/dev/rtc" } { "9" = "/dev/hpet" }
{ "10" = "/dev/hpet" }
} }
{ "save_image_format" = "raw" } { "save_image_format" = "raw" }
{ "dump_image_format" = "raw" } { "dump_image_format" = "raw" }

1
src/security/apparmor/libvirt-qemu
View File

@ -23,7 +23,6 @@
/dev/net/tun rw, /dev/net/tun rw,
/dev/kvm rw, /dev/kvm rw,
/dev/ptmx rw, /dev/ptmx rw,
/dev/kqemu rw,
@{PROC}/*/status r, @{PROC}/*/status r,
# When qemu is signaled to terminate, it will read cmdline of signaling # When qemu is signaled to terminate, it will read cmdline of signaling
# process for reporting purposes. Allowing read access to a process # process for reporting purposes. Allowing read access to a process