Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
b0b968ef
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
b0b968ef
编写于
6月 03, 2009
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Generic shared impls of all NUMA apis
上级
3621d42e
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
151 addition
and
214 deletion
+151
-214
ChangeLog
ChangeLog
+13
-0
src/libvirt_private.syms
src/libvirt_private.syms
+4
-2
src/lxc_conf.c
src/lxc_conf.c
+1
-1
src/nodeinfo.c
src/nodeinfo.c
+108
-19
src/nodeinfo.h
src/nodeinfo.h
+9
-2
src/openvz_conf.c
src/openvz_conf.c
+2
-5
src/openvz_driver.c
src/openvz_driver.c
+1
-6
src/qemu_conf.c
src/qemu_conf.c
+1
-1
src/qemu_driver.c
src/qemu_driver.c
+6
-91
src/uml_conf.c
src/uml_conf.c
+1
-1
src/uml_driver.c
src/uml_driver.c
+3
-81
src/vbox/vbox_tmpl.c
src/vbox/vbox_tmpl.c
+2
-5
未找到文件。
ChangeLog
浏览文件 @
b0b968ef
Wed Jun 3 14:28:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
Generic shared impls of all NUMA apis
* src/libvirt_private.syms: Add all nodeinfo.c APIs
* src/lxc_conf.c, src/openvz_conf, src/qemu_conf.c,
src/vbox/vbox_tmpl.c, src/uml_conf.c: Update for
changed API names in nodeinfo.h
* src/nodeinfo.c, src/nodeinfo.h: Add generic impls of
the virNodeGetCellsFreeMemory & virNodeGetFreeMemory APis
* src/openvz_driver.c: Use nodeGetInfo() directly in driver
* src/qemu_driver.c, src/uml_driver.c: Remove NUMA APis impls
in favour of generic impl in nodeinfo.c
Wed Jun 3 14:12:47 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/openvz_conf.c src/virsh.c: various typo or english fixups
...
...
src/libvirt_private.syms
浏览文件 @
b0b968ef
...
...
@@ -219,8 +219,10 @@ virNetworkObjUnlock;
# nodeinfo.h
virNodeInfoPopulate;
virCapsInitNUMA;
nodeGetInfo;
nodeCapsInitNUMA;
nodeGetCellsFreeMemory;
nodeGetFreeMemory;
# node_device_conf.h
...
...
src/lxc_conf.c
浏览文件 @
b0b968ef
...
...
@@ -46,7 +46,7 @@ virCapsPtr lxcCapsInit(void)
0
,
0
))
==
NULL
)
goto
no_memory
;
if
(
vir
CapsInitNUMA
(
caps
)
<
0
)
if
(
node
CapsInitNUMA
(
caps
)
<
0
)
goto
no_memory
;
/* XXX shouldn't 'borrow' KVM's prefix */
...
...
src/nodeinfo.c
浏览文件 @
b0b968ef
...
...
@@ -48,6 +48,10 @@
#define VIR_FROM_THIS VIR_FROM_NONE
#define nodeReportError(conn, code, fmt...) \
virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \
__FUNCTION__, __LINE__, fmt)
#ifdef __linux__
#define CPUINFO_PATH "/proc/cpuinfo"
...
...
@@ -73,9 +77,8 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n
while
(
*
buf
&&
c_isspace
(
*
buf
))
buf
++
;
if
(
*
buf
!=
':'
)
{
virRaiseError
(
conn
,
NULL
,
NULL
,
0
,
VIR_ERR_INTERNAL_ERROR
,
VIR_ERR_ERROR
,
NULL
,
NULL
,
NULL
,
0
,
0
,
"%s"
,
_
(
"parsing cpuinfo processor"
));
nodeReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"parsing cpuinfo processor"
));
return
-
1
;
}
nodeinfo
->
cpus
++
;
...
...
@@ -86,9 +89,8 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n
while
(
*
buf
&&
c_isspace
(
*
buf
))
buf
++
;
if
(
*
buf
!=
':'
||
!
buf
[
1
])
{
virRaiseError
(
conn
,
NULL
,
NULL
,
0
,
VIR_ERR_INTERNAL_ERROR
,
VIR_ERR_ERROR
,
NULL
,
NULL
,
NULL
,
0
,
0
,
"%s"
,
_
(
"parsing cpuinfo cpu MHz"
));
nodeReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"parsing cpuinfo cpu MHz"
));
return
-
1
;
}
if
(
virStrToLong_ui
(
buf
+
1
,
&
p
,
10
,
&
ui
)
==
0
...
...
@@ -102,9 +104,8 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n
while
(
*
buf
&&
c_isspace
(
*
buf
))
buf
++
;
if
(
*
buf
!=
':'
||
!
buf
[
1
])
{
virRaiseError
(
conn
,
NULL
,
NULL
,
0
,
VIR_ERR_INTERNAL_ERROR
,
VIR_ERR_ERROR
,
NULL
,
NULL
,
NULL
,
0
,
0
,
"parsing cpuinfo cpu cores %c"
,
*
buf
);
nodeReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"parsing cpuinfo cpu cores %c"
,
*
buf
);
return
-
1
;
}
if
(
virStrToLong_ui
(
buf
+
1
,
&
p
,
10
,
&
id
)
==
0
...
...
@@ -115,9 +116,8 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n
}
if
(
!
nodeinfo
->
cpus
)
{
virRaiseError
(
conn
,
NULL
,
NULL
,
0
,
VIR_ERR_INTERNAL_ERROR
,
VIR_ERR_ERROR
,
NULL
,
NULL
,
NULL
,
0
,
0
,
"%s"
,
_
(
"no cpus found"
));
nodeReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"no cpus found"
));
return
-
1
;
}
...
...
@@ -133,8 +133,8 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, virNodeInfoPtr n
#endif
int
virNodeInfoPopulate
(
virConnectPtr
conn
,
virNodeInfoPtr
nodeinfo
)
{
int
nodeGetInfo
(
virConnectPtr
conn
,
virNodeInfoPtr
nodeinfo
)
{
#ifdef HAVE_UNAME
struct
utsname
info
;
...
...
@@ -170,9 +170,8 @@ int virNodeInfoPopulate(virConnectPtr conn,
}
#else
/* XXX Solaris will need an impl later if they port QEMU driver */
virRaiseError
(
conn
,
NULL
,
NULL
,
0
,
VIR_ERR_INTERNAL_ERROR
,
VIR_ERR_ERROR
,
NULL
,
NULL
,
NULL
,
0
,
0
,
"%s:%s not implemented on this platform
\n
"
,
__FILE__
,
__FUNCTION__
);
nodeError
(
conn
,
VIR_ERR_NO_SUPPORT
,
"%s"
_
(
"node info not implemented on this platform"
));
return
-
1
;
#endif
}
...
...
@@ -189,7 +188,7 @@ int virNodeInfoPopulate(virConnectPtr conn,
(((mask)[((cpu) / n_bits(*(mask)))] >> ((cpu) % n_bits(*(mask)))) & 1)
int
vir
CapsInitNUMA
(
virCapsPtr
caps
)
node
CapsInitNUMA
(
virCapsPtr
caps
)
{
int
n
;
unsigned
long
*
mask
=
NULL
;
...
...
@@ -237,6 +236,96 @@ cleanup:
VIR_FREE
(
mask
);
return
ret
;
}
int
nodeGetCellsFreeMemory
(
virConnectPtr
conn
,
unsigned
long
long
*
freeMems
,
int
startCell
,
int
maxCells
)
{
int
n
,
lastCell
,
numCells
;
int
ret
=
-
1
;
int
maxCell
;
if
(
numa_available
()
<
0
)
{
nodeReportError
(
conn
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"NUMA not supported on this host"
));
goto
cleanup
;
}
maxCell
=
numa_max_node
();
if
(
startCell
>
maxCell
)
{
nodeReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"start cell %d out of range (0-%d)"
),
startCell
,
maxCell
);
goto
cleanup
;
}
lastCell
=
startCell
+
maxCells
-
1
;
if
(
lastCell
>
maxCell
)
lastCell
=
maxCell
;
for
(
numCells
=
0
,
n
=
startCell
;
n
<=
lastCell
;
n
++
)
{
long
long
mem
;
if
(
numa_node_size64
(
n
,
&
mem
)
<
0
)
{
nodeReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Failed to query NUMA free memory"
));
goto
cleanup
;
}
freeMems
[
numCells
++
]
=
mem
;
}
ret
=
numCells
;
cleanup:
return
ret
;
}
unsigned
long
long
nodeGetFreeMemory
(
virConnectPtr
conn
)
{
unsigned
long
long
freeMem
=
0
;
int
n
;
if
(
numa_available
()
<
0
)
{
nodeReportError
(
conn
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"NUMA not supported on this host"
));
goto
cleanup
;
}
for
(
n
=
0
;
n
<=
numa_max_node
()
;
n
++
)
{
long
long
mem
;
if
(
numa_node_size64
(
n
,
&
mem
)
<
0
)
{
nodeReportError
(
conn
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Failed to query NUMA free memory"
));
goto
cleanup
;
}
freeMem
+=
mem
;
}
cleanup:
return
freeMem
;
}
#else
int
virCapsInitNUMA
(
virCapsPtr
caps
ATTRIBUTE_UNUSED
)
{
return
0
;
}
int
nodeCapsInitNUMA
(
virCapsPtr
caps
ATTRIBUTE_UNUSED
)
{
return
0
;
}
int
nodeGetCellsFreeMemory
(
virConnectPtr
conn
,
unsigned
long
long
*
freeMems
ATTRIBUTE_UNUSED
,
int
startCell
ATTRIBUTE_UNUSED
,
int
maxCells
ATTRIBUTE_UNUSED
)
{
nodeReportError
(
conn
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"NUMA memory information not available on this platform"
));
return
-
1
;
}
unsigned
long
long
nodeGetFreeMemory
(
virConnectPtr
conn
)
{
nodeReportError
(
conn
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"NUMA memory information not available on this platform"
));
return
0
;
}
#endif
src/nodeinfo.h
浏览文件 @
b0b968ef
...
...
@@ -27,7 +27,14 @@
#include "libvirt/libvirt.h"
#include "capabilities.h"
int
virNodeInfoPopulate
(
virConnectPtr
conn
,
virNodeInfoPtr
nodeinfo
);
int
virCapsInitNUMA
(
virCapsPtr
caps
);
int
nodeGetInfo
(
virConnectPtr
conn
,
virNodeInfoPtr
nodeinfo
);
int
nodeCapsInitNUMA
(
virCapsPtr
caps
);
int
nodeGetCellsFreeMemory
(
virConnectPtr
conn
,
unsigned
long
long
*
freeMems
,
int
startCell
,
int
maxCells
);
unsigned
long
long
nodeGetFreeMemory
(
virConnectPtr
conn
);
#endif
/* __VIR_NODEINFO_H__*/
src/openvz_conf.c
浏览文件 @
b0b968ef
...
...
@@ -148,7 +148,7 @@ virCapsPtr openvzCapsInit(void)
0
,
0
))
==
NULL
)
goto
no_memory
;
if
(
vir
CapsInitNUMA
(
caps
)
<
0
)
if
(
node
CapsInitNUMA
(
caps
)
<
0
)
goto
no_memory
;
virCapabilitiesSetMacPrefix
(
caps
,
(
unsigned
char
[]){
0x52
,
0x54
,
0x00
});
...
...
@@ -527,11 +527,8 @@ openvzGetNodeCPUs(void)
{
virNodeInfo
nodeinfo
;
if
(
virNodeInfoPopulate
(
NULL
,
&
nodeinfo
)
<
0
)
{
openvzError
(
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Could not read nodeinfo"
));
if
(
nodeGetInfo
(
NULL
,
&
nodeinfo
)
<
0
)
return
0
;
}
return
nodeinfo
.
cpus
;
}
...
...
src/openvz_driver.c
浏览文件 @
b0b968ef
...
...
@@ -1136,11 +1136,6 @@ static const char *openvzGetType(virConnectPtr conn ATTRIBUTE_UNUSED) {
return
strdup
(
"OpenVZ"
);
}
static
int
openvzGetNodeInfo
(
virConnectPtr
conn
,
virNodeInfoPtr
nodeinfo
)
{
return
virNodeInfoPopulate
(
conn
,
nodeinfo
);
}
static
char
*
openvzGetCapabilities
(
virConnectPtr
conn
)
{
struct
openvz_driver
*
driver
=
conn
->
privateData
;
char
*
ret
;
...
...
@@ -1316,7 +1311,7 @@ static virDriver openvzDriver = {
openvzGetVersion
,
/* version */
NULL
,
/* getHostname */
openvzGetMaxVCPUs
,
/* getMaxVcpus */
openvzGetNode
Info
,
/* nodeGetInfo */
nodeGet
Info
,
/* nodeGetInfo */
openvzGetCapabilities
,
/* getCapabilities */
openvzListDomains
,
/* listDomains */
openvzNumDomains
,
/* numOfDomains */
...
...
src/qemu_conf.c
浏览文件 @
b0b968ef
...
...
@@ -377,7 +377,7 @@ virCapsPtr qemudCapsInit(void) {
/* Using KVM's mac prefix for QEMU too */
virCapabilitiesSetMacPrefix
(
caps
,
(
unsigned
char
[]){
0x52
,
0x54
,
0x00
});
if
(
vir
CapsInitNUMA
(
caps
)
<
0
)
if
(
node
CapsInitNUMA
(
caps
)
<
0
)
goto
no_memory
;
virCapabilitiesAddHostMigrateTransport
(
caps
,
...
...
src/qemu_driver.c
浏览文件 @
b0b968ef
...
...
@@ -44,11 +44,6 @@
#include <sys/wait.h>
#include <sys/ioctl.h>
#if HAVE_NUMACTL
#define NUMA_VERSION1_COMPATIBILITY 1
#include <numa.h>
#endif
#if HAVE_SCHED_H
#include <sched.h>
#endif
...
...
@@ -1103,7 +1098,7 @@ qemudInitCpus(virConnectPtr conn,
int
i
,
maxcpu
=
QEMUD_CPUMASK_LEN
;
virNodeInfo
nodeinfo
;
if
(
virNodeInfoPopulate
(
conn
,
&
nodeinfo
)
<
0
)
if
(
nodeGetInfo
(
conn
,
&
nodeinfo
)
<
0
)
return
-
1
;
/* setaffinity fails if you set bits for CPUs which
...
...
@@ -1880,11 +1875,6 @@ static int qemudGetMaxVCPUs(virConnectPtr conn, const char *type) {
return
-
1
;
}
static
int
qemudGetNodeInfo
(
virConnectPtr
conn
,
virNodeInfoPtr
nodeinfo
)
{
return
virNodeInfoPopulate
(
conn
,
nodeinfo
);
}
static
char
*
qemudGetCapabilities
(
virConnectPtr
conn
)
{
struct
qemud_driver
*
driver
=
conn
->
privateData
;
...
...
@@ -1901,76 +1891,6 @@ static char *qemudGetCapabilities(virConnectPtr conn) {
}
#if HAVE_NUMACTL
static
int
qemudNodeGetCellsFreeMemory
(
virConnectPtr
conn
,
unsigned
long
long
*
freeMems
,
int
startCell
,
int
maxCells
)
{
int
n
,
lastCell
,
numCells
;
int
ret
=
-
1
;
int
maxCell
;
if
(
numa_available
()
<
0
)
{
qemudReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"NUMA not supported on this host"
));
goto
cleanup
;
}
maxCell
=
numa_max_node
();
if
(
startCell
>
maxCell
)
{
qemudReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_INTERNAL_ERROR
,
_
(
"start cell %d out of range (0-%d)"
),
startCell
,
maxCell
);
goto
cleanup
;
}
lastCell
=
startCell
+
maxCells
-
1
;
if
(
lastCell
>
maxCell
)
lastCell
=
maxCell
;
for
(
numCells
=
0
,
n
=
startCell
;
n
<=
lastCell
;
n
++
)
{
long
long
mem
;
if
(
numa_node_size64
(
n
,
&
mem
)
<
0
)
{
qemudReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Failed to query NUMA free memory"
));
goto
cleanup
;
}
freeMems
[
numCells
++
]
=
mem
;
}
ret
=
numCells
;
cleanup:
return
ret
;
}
static
unsigned
long
long
qemudNodeGetFreeMemory
(
virConnectPtr
conn
)
{
unsigned
long
long
freeMem
=
0
;
int
n
;
if
(
numa_available
()
<
0
)
{
qemudReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"NUMA not supported on this host"
));
goto
cleanup
;
}
for
(
n
=
0
;
n
<=
numa_max_node
()
;
n
++
)
{
long
long
mem
;
if
(
numa_node_size64
(
n
,
&
mem
)
<
0
)
{
qemudReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Failed to query NUMA free memory"
));
goto
cleanup
;
}
freeMem
+=
mem
;
}
cleanup:
return
freeMem
;
}
#endif
static
int
qemudGetProcessInfo
(
unsigned
long
long
*
cpuTime
,
int
pid
)
{
char
proc
[
PATH_MAX
];
FILE
*
pidinfo
;
...
...
@@ -2995,7 +2915,7 @@ qemudDomainPinVcpu(virDomainPtr dom,
goto
cleanup
;
}
if
(
virNodeInfoPopulate
(
dom
->
conn
,
&
nodeinfo
)
<
0
)
if
(
nodeGetInfo
(
dom
->
conn
,
&
nodeinfo
)
<
0
)
goto
cleanup
;
maxcpu
=
maplen
*
8
;
...
...
@@ -3057,7 +2977,7 @@ qemudDomainGetVcpus(virDomainPtr dom,
goto
cleanup
;
}
if
(
virNodeInfoPopulate
(
dom
->
conn
,
&
nodeinfo
)
<
0
)
if
(
nodeGetInfo
(
dom
->
conn
,
&
nodeinfo
)
<
0
)
goto
cleanup
;
maxcpu
=
maplen
*
8
;
...
...
@@ -5349,7 +5269,7 @@ static virDriver qemuDriver = {
qemudGetVersion
,
/* version */
qemudGetHostname
,
/* getHostname */
qemudGetMaxVCPUs
,
/* getMaxVcpus */
qemudGetNode
Info
,
/* nodeGetInfo */
nodeGet
Info
,
/* nodeGetInfo */
qemudGetCapabilities
,
/* getCapabilities */
qemudListDomains
,
/* listDomains */
qemudNumDomains
,
/* numOfDomains */
...
...
@@ -5403,13 +5323,8 @@ static virDriver qemuDriver = {
qemudDomainInterfaceStats
,
/* domainInterfaceStats */
qemudDomainBlockPeek
,
/* domainBlockPeek */
qemudDomainMemoryPeek
,
/* domainMemoryPeek */
#if HAVE_NUMACTL
qemudNodeGetCellsFreeMemory
,
/* nodeGetCellsFreeMemory */
qemudNodeGetFreeMemory
,
/* getFreeMemory */
#else
NULL
,
/* nodeGetCellsFreeMemory */
NULL
,
/* getFreeMemory */
#endif
nodeGetCellsFreeMemory
,
/* nodeGetCellsFreeMemory */
nodeGetFreeMemory
,
/* getFreeMemory */
qemudDomainEventRegister
,
/* domainEventRegister */
qemudDomainEventDeregister
,
/* domainEventDeregister */
qemudDomainMigratePrepare2
,
/* domainMigratePrepare2 */
...
...
src/uml_conf.c
浏览文件 @
b0b968ef
...
...
@@ -63,7 +63,7 @@ virCapsPtr umlCapsInit(void) {
0
,
0
))
==
NULL
)
goto
no_memory
;
if
(
vir
CapsInitNUMA
(
caps
)
<
0
)
if
(
node
CapsInitNUMA
(
caps
)
<
0
)
goto
no_memory
;
if
((
guest
=
virCapabilitiesAddGuest
(
caps
,
...
...
src/uml_driver.c
浏览文件 @
b0b968ef
...
...
@@ -45,11 +45,6 @@
#include <sys/ioctl.h>
#include <sys/inotify.h>
#if HAVE_NUMACTL
#define NUMA_VERSION1_COMPATIBILITY 1
#include <numa.h>
#endif
#include "uml_driver.h"
#include "uml_conf.h"
#include "event.h"
...
...
@@ -964,11 +959,6 @@ static const char *umlGetType(virConnectPtr conn ATTRIBUTE_UNUSED) {
return
"UML"
;
}
static
int
umlGetNodeInfo
(
virConnectPtr
conn
,
virNodeInfoPtr
nodeinfo
)
{
return
virNodeInfoPopulate
(
conn
,
nodeinfo
);
}
static
char
*
umlGetCapabilities
(
virConnectPtr
conn
)
{
struct
uml_driver
*
driver
=
(
struct
uml_driver
*
)
conn
->
privateData
;
...
...
@@ -983,69 +973,6 @@ static char *umlGetCapabilities(virConnectPtr conn) {
}
#if HAVE_NUMACTL
static
int
umlNodeGetCellsFreeMemory
(
virConnectPtr
conn
,
unsigned
long
long
*
freeMems
,
int
startCell
,
int
maxCells
)
{
int
n
,
lastCell
,
numCells
;
int
ret
=
-
1
;
if
(
numa_available
()
<
0
)
{
umlReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"NUMA not supported on this host"
));
goto
cleanup
;
}
lastCell
=
startCell
+
maxCells
-
1
;
if
(
lastCell
>
numa_max_node
())
lastCell
=
numa_max_node
();
for
(
numCells
=
0
,
n
=
startCell
;
n
<=
lastCell
;
n
++
)
{
long
long
mem
;
if
(
numa_node_size64
(
n
,
&
mem
)
<
0
)
{
umlReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Failed to query NUMA free memory"
));
goto
cleanup
;
}
freeMems
[
numCells
++
]
=
mem
;
}
ret
=
numCells
;
cleanup:
return
ret
;
}
static
unsigned
long
long
umlNodeGetFreeMemory
(
virConnectPtr
conn
)
{
unsigned
long
long
freeMem
=
0
;
unsigned
long
long
ret
=
-
1
;
int
n
;
if
(
numa_available
()
<
0
)
{
umlReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_NO_SUPPORT
,
"%s"
,
_
(
"NUMA not supported on this host"
));
goto
cleanup
;
}
for
(
n
=
0
;
n
<=
numa_max_node
()
;
n
++
)
{
long
long
mem
;
if
(
numa_node_size64
(
n
,
&
mem
)
<
0
)
{
umlReportError
(
conn
,
NULL
,
NULL
,
VIR_ERR_INTERNAL_ERROR
,
"%s"
,
_
(
"Failed to query NUMA free memory"
));
goto
cleanup
;
}
freeMem
+=
mem
;
}
ret
=
freeMem
;
cleanup:
return
ret
;
}
#endif
static
int
umlGetProcessInfo
(
unsigned
long
long
*
cpuTime
,
int
pid
)
{
char
proc
[
PATH_MAX
];
...
...
@@ -1855,7 +1782,7 @@ static virDriver umlDriver = {
umlGetVersion
,
/* version */
umlGetHostname
,
/* getHostname */
NULL
,
/* getMaxVcpus */
umlGetNode
Info
,
/* nodeGetInfo */
nodeGet
Info
,
/* nodeGetInfo */
umlGetCapabilities
,
/* getCapabilities */
umlListDomains
,
/* listDomains */
umlNumDomains
,
/* numOfDomains */
...
...
@@ -1904,13 +1831,8 @@ static virDriver umlDriver = {
NULL
,
/* domainInterfaceStats */
umlDomainBlockPeek
,
/* domainBlockPeek */
NULL
,
/* domainMemoryPeek */
#if HAVE_NUMACTL
umlNodeGetCellsFreeMemory
,
/* nodeGetCellsFreeMemory */
umlNodeGetFreeMemory
,
/* getFreeMemory */
#else
NULL
,
/* nodeGetCellsFreeMemory */
NULL
,
/* getFreeMemory */
#endif
virNodeGetCellsFreeMemory
,
/* nodeGetCellsFreeMemory */
virNodeGetFreeMemory
,
/* getFreeMemory */
NULL
,
/* domainEventRegister */
NULL
,
/* domainEventDeregister */
NULL
,
/* domainMigratePrepare2 */
...
...
src/vbox/vbox_tmpl.c
浏览文件 @
b0b968ef
...
...
@@ -186,7 +186,7 @@ static virCapsPtr vboxCapsInit(void) {
0
,
0
))
==
NULL
)
goto
no_memory
;
if
(
vir
CapsInitNUMA
(
caps
)
<
0
)
if
(
node
CapsInitNUMA
(
caps
)
<
0
)
goto
no_memory
;
virCapabilitiesSetMacPrefix
(
caps
,
(
unsigned
char
[]){
0x08
,
0x00
,
0x27
});
...
...
@@ -413,9 +413,6 @@ static int vboxGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED
return
ret
;
}
static
int
vboxNodeGetInfo
(
virConnectPtr
conn
,
virNodeInfoPtr
nodeinfo
)
{
return
virNodeInfoPopulate
(
conn
,
nodeinfo
);
}
static
char
*
vboxGetCapabilities
(
virConnectPtr
conn
)
{
vboxGlobalData
*
data
=
conn
->
privateData
;
...
...
@@ -4909,7 +4906,7 @@ virDriver NAME(Driver) = {
.
version
=
vboxGetVersion
,
.
getHostname
=
vboxGetHostname
,
.
getMaxVcpus
=
vboxGetMaxVcpus
,
.
nodeGetInfo
=
vboxN
odeGetInfo
,
.
nodeGetInfo
=
n
odeGetInfo
,
.
getCapabilities
=
vboxGetCapabilities
,
.
listDomains
=
vboxListDomains
,
.
numOfDomains
=
vboxNumOfDomains
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录