NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

nodeinfo: make freebsdNodeGetCPUCount work on Mac OS X

Browse Source 
This fixes the following error:
  error : nodeGetInfo:933 : this function is not supported
  by the connection driver: node info not implemented on this platform

The freebsdNodeGetCPUCount was renamed to appleFreebsdNodeGetCPUCount
in order to make more visible the fact, that it works on Mac OS X too.

Mac OS X can use sysctlbyname as same as FreeBSD to get the CPU
frequency. However, the MIB style name is different from FreeBSD's.
And the unit of the return frequency is also different.

Signed-off-by: Ryota Ozaki <ozaki.ryota@gmail.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ryota Ozaki 2013-10-05 14:56:37 +09:00 committed by Michal Privoznik
parent 5a468b38b6
commit 2d74822a9e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nodeinfo.c
View File

@ -38,7 +38,7 @@
# include <numa.h> # include <numa.h>
#endif #endif
#ifdef __FreeBSD__ #if defined(__FreeBSD__) || defined(__APPLE__)
# include <sys/types.h> # include <sys/types.h>
# include <sys/sysctl.h> # include <sys/sysctl.h>
#endif #endif
@ -58,9 +58,9 @@
#define VIR_FROM_THIS VIR_FROM_NONE #define VIR_FROM_THIS VIR_FROM_NONE
#ifdef __FreeBSD__ #if defined(__FreeBSD__) || defined(__APPLE__)
static int static int
freebsdNodeGetCPUCount(void) appleFreebsdNodeGetCPUCount(void)
{ {
int ncpu_mib[2] = { CTL_HW, HW_NCPU }; int ncpu_mib[2] = { CTL_HW, HW_NCPU };
unsigned long ncpu; unsigned long ncpu;
@ -882,13 +882,13 @@ cleanup:
VIR_FORCE_FCLOSE(cpuinfo); VIR_FORCE_FCLOSE(cpuinfo);
return ret; return ret;
} }
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__) || defined(__APPLE__)
{ {
nodeinfo->nodes = 1; nodeinfo->nodes = 1;
nodeinfo->sockets = 1; nodeinfo->sockets = 1;
nodeinfo->threads = 1; nodeinfo->threads = 1;
nodeinfo->cpus = freebsdNodeGetCPUCount(); nodeinfo->cpus = appleFreebsdNodeGetCPUCount();
if (nodeinfo->cpus == -1) if (nodeinfo->cpus == -1)
return -1; return -1;
@ -897,12 +897,21 @@ cleanup:
unsigned long cpu_freq; unsigned long cpu_freq;
size_t cpu_freq_len = sizeof(cpu_freq); size_t cpu_freq_len = sizeof(cpu_freq);
# ifdef __FreeBSD__
if (sysctlbyname("dev.cpu.0.freq", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { if (sysctlbyname("dev.cpu.0.freq", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) {
virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); virReportSystemError(errno, "%s", _("cannot obtain CPU freq"));
return -1; return -1;
} }
nodeinfo->mhz = cpu_freq; nodeinfo->mhz = cpu_freq;
# else
if (sysctlbyname("hw.cpufrequency", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) {
virReportSystemError(errno, "%s", _("cannot obtain CPU freq"));
return -1;
}
nodeinfo->mhz = cpu_freq / 1000000;
# endif
/* get memory information */ /* get memory information */
int mib[2] = { CTL_HW, HW_PHYSMEM }; int mib[2] = { CTL_HW, HW_PHYSMEM };