External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: hostcpu: Only define /dev/kvm path once

Browse Source 
Remove the local kvmpath variable from
virHostCPUGetThreadsPerSubcore() and use the file-global
KVM_DEVICE define instead.
This commit is contained in:
Andrea Bolognani 2016-06-24 19:34:38 +02:00
parent aa7bb4f36d
commit 9c992f437c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/util/virhostcpu.c
View File

@ -1249,7 +1249,6 @@ int
virHostCPUGetThreadsPerSubcore(virArch arch) virHostCPUGetThreadsPerSubcore(virArch arch)
{ {
int threads_per_subcore = 0; int threads_per_subcore = 0;
const char *kvmpath = "/dev/kvm";
int kvmfd; int kvmfd;
if (ARCH_IS_PPC64(arch)) { if (ARCH_IS_PPC64(arch)) {
@ -1259,17 +1258,17 @@ virHostCPUGetThreadsPerSubcore(virArch arch)
* b. the kvm module might not be installed or enabled * b. the kvm module might not be installed or enabled
* In either case, falling back to the subcore-unaware thread * In either case, falling back to the subcore-unaware thread
* counting logic is the right thing to do */ * counting logic is the right thing to do */
if (!virFileExists(kvmpath)) if (!virFileExists(KVM_DEVICE))
goto out; goto out;
if ((kvmfd = open(kvmpath, O_RDONLY)) < 0) { if ((kvmfd = open(KVM_DEVICE, O_RDONLY)) < 0) {
/* This can happen when running as a regular user if /* This can happen when running as a regular user if
* permissions are tight enough, in which case erroring out * permissions are tight enough, in which case erroring out
* is better than silently falling back and reporting * is better than silently falling back and reporting
* different nodeinfo depending on the user */ * different nodeinfo depending on the user */
virReportSystemError(errno, virReportSystemError(errno,
_("Failed to open '%s'"), _("Failed to open '%s'"),
kvmpath); KVM_DEVICE);
threads_per_subcore = -1; threads_per_subcore = -1;
goto out; goto out;
} }