Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
c7d5dd39
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c7d5dd39
编写于
6月 29, 2016
作者:
P
Peter Krempa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
conf: Rename virDomainVcpuInfoPtr to virDomainVcpuDefPtr
上级
54f875dc
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
31 addition
and
31 deletion
+31
-31
src/conf/domain_conf.c
src/conf/domain_conf.c
+11
-11
src/conf/domain_conf.h
src/conf/domain_conf.h
+5
-5
src/libxl/libxl_domain.c
src/libxl/libxl_domain.c
+1
-1
src/libxl/libxl_driver.c
src/libxl/libxl_driver.c
+1
-1
src/qemu/qemu_cgroup.c
src/qemu/qemu_cgroup.c
+1
-1
src/qemu/qemu_driver.c
src/qemu/qemu_driver.c
+7
-7
src/qemu/qemu_process.c
src/qemu/qemu_process.c
+2
-2
src/test/test_driver.c
src/test/test_driver.c
+2
-2
src/vz/vz_sdk.c
src/vz/vz_sdk.c
+1
-1
未找到文件。
src/conf/domain_conf.c
浏览文件 @
c7d5dd39
...
...
@@ -1307,7 +1307,7 @@ void virDomainLeaseDefFree(virDomainLeaseDefPtr def)
static void
virDomainVcpu
InfoClear(virDomainVcpuInfo
Ptr info)
virDomainVcpu
DefClear(virDomainVcpuDef
Ptr info)
{
if (!info)
return;
...
...
@@ -1331,7 +1331,7 @@ virDomainDefSetVcpusMax(virDomainDefPtr def,
return -1;
} else {
for (i = maxvcpus; i < def->maxvcpus; i++)
virDomainVcpu
Info
Clear(&def->vcpus[i]);
virDomainVcpu
Def
Clear(&def->vcpus[i]);
VIR_SHRINK_N(def->vcpus, def->maxvcpus, def->maxvcpus - maxvcpus);
}
...
...
@@ -1423,7 +1423,7 @@ virDomainDefGetOnlineVcpumap(const virDomainDef *def)
}
virDomainVcpu
Info
Ptr
virDomainVcpu
Def
Ptr
virDomainDefGetVcpu(virDomainDefPtr def,
unsigned int vcpu)
{
...
...
@@ -1442,7 +1442,7 @@ static virDomainThreadSchedParamPtr
virDomainDefGetVcpuSched(virDomainDefPtr def,
unsigned int vcpu)
{
virDomainVcpu
Info
Ptr vcpuinfo;
virDomainVcpu
Def
Ptr vcpuinfo;
if (!(vcpuinfo = virDomainDefGetVcpu(def, vcpu)))
return NULL;
...
...
@@ -1508,7 +1508,7 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def,
virBitmapSetAll(allcpumap);
for (i = 0; i < maxvcpus && i < ncpumaps; i++) {
virDomainVcpu
Info
Ptr vcpu = virDomainDefGetVcpu(def, i);
virDomainVcpu
Def
Ptr vcpu = virDomainDefGetVcpu(def, i);
virBitmapPtr bitmap = NULL;
if (vcpu->cpumask)
...
...
@@ -2522,7 +2522,7 @@ void virDomainDefFree(virDomainDefPtr def)
virDomainResourceDefFree(def->resource);
for (i = 0; i < def->maxvcpus; i++)
virDomainVcpu
Info
Clear(&def->vcpus[i]);
virDomainVcpu
Def
Clear(&def->vcpus[i]);
VIR_FREE(def->vcpus);
/* hostdevs must be freed before nets (or any future "intelligent
...
...
@@ -4178,7 +4178,7 @@ static void
virDomainDefRemoveOfflineVcpuPin(virDomainDefPtr def)
{
size_t i;
virDomainVcpu
Info
Ptr vcpu;
virDomainVcpu
Def
Ptr vcpu;
for (i = 0; i < virDomainDefGetVcpusMax(def); i++) {
vcpu = virDomainDefGetVcpu(def, i);
...
...
@@ -14885,7 +14885,7 @@ static int
virDomainVcpuPinDefParseXML(virDomainDefPtr def,
xmlNodePtr node)
{
virDomainVcpu
Info
Ptr vcpu;
virDomainVcpu
Def
Ptr vcpu;
unsigned int vcpuid;
char *tmp = NULL;
int ret = -1;
...
...
@@ -18518,8 +18518,8 @@ virDomainDefVcpuCheckAbiStability(virDomainDefPtr src,
}
for (i = 0; i < src->maxvcpus; i++) {
virDomainVcpu
Info
Ptr svcpu = &src->vcpus[i];
virDomainVcpu
Info
Ptr dvcpu = &dst->vcpus[i];
virDomainVcpu
Def
Ptr svcpu = &src->vcpus[i];
virDomainVcpu
Def
Ptr dvcpu = &dst->vcpus[i];
if (svcpu->online != dvcpu->online) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
...
...
@@ -22717,7 +22717,7 @@ virDomainCputuneDefFormat(virBufferPtr buf,
for (i = 0; i < def->maxvcpus; i++) {
char *cpumask;
virDomainVcpu
Info
Ptr vcpu = def->vcpus + i;
virDomainVcpu
Def
Ptr vcpu = def->vcpus + i;
if (!vcpu->cpumask)
continue;
...
...
src/conf/domain_conf.h
浏览文件 @
c7d5dd39
...
...
@@ -2029,10 +2029,10 @@ struct _virDomainCputune {
};
typedef
struct
_virDomainVcpu
Info
virDomainVcpuInfo
;
typedef
virDomainVcpu
Info
*
virDomainVcpuInfo
Ptr
;
typedef
struct
_virDomainVcpu
Def
virDomainVcpuDef
;
typedef
virDomainVcpu
Def
*
virDomainVcpuDef
Ptr
;
struct
_virDomainVcpu
Info
{
struct
_virDomainVcpu
Def
{
bool
online
;
virBitmapPtr
cpumask
;
...
...
@@ -2117,7 +2117,7 @@ struct _virDomainDef {
virDomainBlkiotune
blkio
;
virDomainMemtune
mem
;
virDomainVcpu
Info
Ptr
vcpus
;
virDomainVcpu
Def
Ptr
vcpus
;
size_t
maxvcpus
;
int
placement_mode
;
virBitmapPtr
cpumask
;
...
...
@@ -2251,7 +2251,7 @@ unsigned int virDomainDefGetVcpusMax(const virDomainDef *def);
int
virDomainDefSetVcpus
(
virDomainDefPtr
def
,
unsigned
int
vcpus
);
unsigned
int
virDomainDefGetVcpus
(
const
virDomainDef
*
def
);
virBitmapPtr
virDomainDefGetOnlineVcpumap
(
const
virDomainDef
*
def
);
virDomainVcpu
Info
Ptr
virDomainDefGetVcpu
(
virDomainDefPtr
def
,
unsigned
int
vcpu
)
virDomainVcpu
Def
Ptr
virDomainDefGetVcpu
(
virDomainDefPtr
def
,
unsigned
int
vcpu
)
ATTRIBUTE_RETURN_CHECK
;
unsigned
long
long
virDomainDefGetMemoryInitial
(
const
virDomainDef
*
def
);
...
...
src/libxl/libxl_domain.c
浏览文件 @
c7d5dd39
...
...
@@ -841,7 +841,7 @@ int
libxlDomainSetVcpuAffinities
(
libxlDriverPrivatePtr
driver
,
virDomainObjPtr
vm
)
{
libxlDriverConfigPtr
cfg
=
libxlDriverConfigGet
(
driver
);
virDomainVcpu
Info
Ptr
vcpu
;
virDomainVcpu
Def
Ptr
vcpu
;
libxl_bitmap
map
;
virBitmapPtr
cpumask
=
NULL
;
size_t
i
;
...
...
src/libxl/libxl_driver.c
浏览文件 @
c7d5dd39
...
...
@@ -2314,7 +2314,7 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu,
libxlDriverConfigPtr
cfg
=
libxlDriverConfigGet
(
driver
);
virDomainDefPtr
targetDef
=
NULL
;
virBitmapPtr
pcpumap
=
NULL
;
virDomainVcpu
Info
Ptr
vcpuinfo
;
virDomainVcpu
Def
Ptr
vcpuinfo
;
virDomainObjPtr
vm
;
int
ret
=
-
1
;
...
...
src/qemu/qemu_cgroup.c
浏览文件 @
c7d5dd39
...
...
@@ -874,7 +874,7 @@ qemuRestoreCgroupState(virDomainObjPtr vm)
goto
error
;
for
(
i
=
0
;
i
<
virDomainDefGetVcpusMax
(
vm
->
def
);
i
++
)
{
virDomainVcpu
Info
Ptr
vcpu
=
virDomainDefGetVcpu
(
vm
->
def
,
i
);
virDomainVcpu
Def
Ptr
vcpu
=
virDomainDefGetVcpu
(
vm
->
def
,
i
);
if
(
!
vcpu
->
online
)
continue
;
...
...
src/qemu/qemu_driver.c
浏览文件 @
c7d5dd39
...
...
@@ -1475,7 +1475,7 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm,
memset(cpumaps, 0, sizeof(*cpumaps) * maxinfo);
for (i = 0; i < virDomainDefGetVcpusMax(vm->def) && ncpuinfo < maxinfo; i++) {
virDomainVcpu
Info
Ptr vcpu = virDomainDefGetVcpu(vm->def, i);
virDomainVcpu
Def
Ptr vcpu = virDomainDefGetVcpu(vm->def, i);
pid_t vcpupid = qemuDomainGetVcpuPid(vm, i);
if (!vcpu->online)
...
...
@@ -4606,7 +4606,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriverPtr driver,
unsigned int vcpu)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
virDomainVcpu
Info
Ptr vcpuinfo;
virDomainVcpu
Def
Ptr vcpuinfo;
int ret = -1;
int rc;
int oldvcpus = virDomainDefGetVcpus(vm->def);
...
...
@@ -4658,7 +4658,7 @@ qemuDomainHotplugDelVcpu(virQEMUDriverPtr driver,
unsigned int vcpu)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
virDomainVcpu
Info
Ptr vcpuinfo;
virDomainVcpu
Def
Ptr vcpuinfo;
int ret = -1;
int rc;
int oldvcpus = virDomainDefGetVcpus(vm->def);
...
...
@@ -4905,7 +4905,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm,
virBitmapPtr cpumap)
{
virBitmapPtr tmpmap = NULL;
virDomainVcpu
Info
Ptr vcpuinfo;
virDomainVcpu
Def
Ptr vcpuinfo;
qemuDomainObjPrivatePtr priv = vm->privateData;
virCgroupPtr cgroup_vcpu = NULL;
char *str = NULL;
...
...
@@ -4992,7 +4992,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
virDomainDefPtr persistentDef;
int ret = -1;
virBitmapPtr pcpumap = NULL;
virDomainVcpu
Info
Ptr vcpuinfo = NULL;
virDomainVcpu
Def
Ptr vcpuinfo = NULL;
virQEMUDriverConfigPtr cfg = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
...
...
@@ -9346,7 +9346,7 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm,
virCgroupFree(&cgroup_temp);
for (i = 0; i < virDomainDefGetVcpusMax(vm->def); i++) {
virDomainVcpu
Info
Ptr vcpu = virDomainDefGetVcpu(vm->def, i);
virDomainVcpu
Def
Ptr vcpu = virDomainDefGetVcpu(vm->def, i);
if (!vcpu->online)
continue;
...
...
@@ -9757,7 +9757,7 @@ qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup,
return 0;
for (i = 0; i < virDomainDefGetVcpusMax(vm->def); i++) {
virDomainVcpu
Info
Ptr vcpu = virDomainDefGetVcpu(vm->def, i);
virDomainVcpu
Def
Ptr vcpu = virDomainDefGetVcpu(vm->def, i);
if (!vcpu->online)
continue;
...
...
src/qemu/qemu_process.c
浏览文件 @
c7d5dd39
...
...
@@ -4577,7 +4577,7 @@ qemuProcessSetupVcpu(virDomainObjPtr vm,
unsigned
int
vcpuid
)
{
pid_t
vcpupid
=
qemuDomainGetVcpuPid
(
vm
,
vcpuid
);
virDomainVcpu
Info
Ptr
vcpu
=
virDomainDefGetVcpu
(
vm
->
def
,
vcpuid
);
virDomainVcpu
Def
Ptr
vcpu
=
virDomainDefGetVcpu
(
vm
->
def
,
vcpuid
);
qemuDomainObjPrivatePtr
priv
=
vm
->
privateData
;
char
*
mem_mask
=
NULL
;
virDomainNumatuneMemMode
mem_mode
;
...
...
@@ -4658,7 +4658,7 @@ qemuProcessSetupVcpu(virDomainObjPtr vm,
static
int
qemuProcessSetupVcpus
(
virDomainObjPtr
vm
)
{
virDomainVcpu
Info
Ptr
vcpu
;
virDomainVcpu
Def
Ptr
vcpu
;
unsigned
int
maxvcpus
=
virDomainDefGetVcpusMax
(
vm
->
def
);
size_t
i
;
...
...
src/test/test_driver.c
浏览文件 @
c7d5dd39
...
...
@@ -2457,7 +2457,7 @@ static int testDomainGetVcpus(virDomainPtr domain,
memset
(
cpumaps
,
0
,
maxinfo
*
maplen
);
for
(
i
=
0
;
i
<
maxinfo
;
i
++
)
{
virDomainVcpu
Info
Ptr
vcpu
=
virDomainDefGetVcpu
(
def
,
i
);
virDomainVcpu
Def
Ptr
vcpu
=
virDomainDefGetVcpu
(
def
,
i
);
virBitmapPtr
bitmap
=
NULL
;
if
(
!
vcpu
->
online
)
...
...
@@ -2493,7 +2493,7 @@ static int testDomainPinVcpu(virDomainPtr domain,
unsigned
char
*
cpumap
,
int
maplen
)
{
virDomainVcpu
Info
Ptr
vcpuinfo
;
virDomainVcpu
Def
Ptr
vcpuinfo
;
virDomainObjPtr
privdom
;
virDomainDefPtr
def
;
int
ret
=
-
1
;
...
...
src/vz/vz_sdk.c
浏览文件 @
c7d5dd39
...
...
@@ -2284,7 +2284,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def)
}
for
(
i
=
0
;
i
<
virDomainDefGetVcpusMax
(
def
);
i
++
)
{
virDomainVcpu
Info
Ptr
vcpu
=
virDomainDefGetVcpu
(
def
,
i
);
virDomainVcpu
Def
Ptr
vcpu
=
virDomainDefGetVcpu
(
def
,
i
);
if
(
vcpu
->
cpumask
&&
!
virBitmapEqual
(
def
->
cpumask
,
vcpu
->
cpumask
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录