Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
6b6cb7ea
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,发现更多精彩内容 >>
提交
6b6cb7ea
编写于
12月 30, 2010
作者:
M
Matthias Bolte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
esx: Fix "occurence" typo (again)
Also include some whitespace changes. No functional change included.
上级
8d2e24d6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
15 deletion
+28
-15
src/esx/esx_driver.c
src/esx/esx_driver.c
+10
-0
src/esx/esx_vi.c
src/esx/esx_vi.c
+14
-11
src/esx/esx_vi.h
src/esx/esx_vi.h
+4
-4
未找到文件。
src/esx/esx_driver.c
浏览文件 @
6b6cb7ea
...
@@ -2475,6 +2475,7 @@ esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus,
...
@@ -2475,6 +2475,7 @@ esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus,
}
}
static
int
static
int
esxDomainSetVcpus
(
virDomainPtr
domain
,
unsigned
int
nvcpus
)
esxDomainSetVcpus
(
virDomainPtr
domain
,
unsigned
int
nvcpus
)
{
{
...
@@ -2482,6 +2483,7 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
...
@@ -2482,6 +2483,7 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
}
}
static
int
static
int
esxDomainGetVcpusFlags
(
virDomainPtr
domain
,
unsigned
int
flags
)
esxDomainGetVcpusFlags
(
virDomainPtr
domain
,
unsigned
int
flags
)
{
{
...
@@ -2540,6 +2542,8 @@ esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
...
@@ -2540,6 +2542,8 @@ esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
return
priv
->
maxVcpus
;
return
priv
->
maxVcpus
;
}
}
static
int
static
int
esxDomainGetMaxVcpus
(
virDomainPtr
domain
)
esxDomainGetMaxVcpus
(
virDomainPtr
domain
)
{
{
...
@@ -2547,6 +2551,8 @@ esxDomainGetMaxVcpus(virDomainPtr domain)
...
@@ -2547,6 +2551,8 @@ esxDomainGetMaxVcpus(virDomainPtr domain)
VIR_DOMAIN_VCPU_MAXIMUM
));
VIR_DOMAIN_VCPU_MAXIMUM
));
}
}
static
char
*
static
char
*
esxDomainDumpXML
(
virDomainPtr
domain
,
int
flags
)
esxDomainDumpXML
(
virDomainPtr
domain
,
int
flags
)
{
{
...
@@ -3809,12 +3815,16 @@ esxDomainIsPersistent(virDomainPtr domain ATTRIBUTE_UNUSED)
...
@@ -3809,12 +3815,16 @@ esxDomainIsPersistent(virDomainPtr domain ATTRIBUTE_UNUSED)
return
1
;
return
1
;
}
}
static
int
static
int
esxDomainIsUpdated
(
virDomainPtr
domain
ATTRIBUTE_UNUSED
)
esxDomainIsUpdated
(
virDomainPtr
domain
ATTRIBUTE_UNUSED
)
{
{
return
0
;
return
0
;
}
}
static
virDomainSnapshotPtr
static
virDomainSnapshotPtr
esxDomainSnapshotCreateXML
(
virDomainPtr
domain
,
const
char
*
xmlDesc
,
esxDomainSnapshotCreateXML
(
virDomainPtr
domain
,
const
char
*
xmlDesc
,
unsigned
int
flags
)
unsigned
int
flags
)
...
...
src/esx/esx_vi.c
浏览文件 @
6b6cb7ea
...
@@ -1812,7 +1812,7 @@ esxVI_GetVirtualMachineQuestionInfo
...
@@ -1812,7 +1812,7 @@ esxVI_GetVirtualMachineQuestionInfo
int
int
esxVI_GetBoolean
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
esxVI_GetBoolean
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
esxVI_Boolean
*
value
,
esxVI_Occurrence
occurence
)
esxVI_Boolean
*
value
,
esxVI_Occurrence
occur
r
ence
)
{
{
esxVI_DynamicProperty
*
dynamicProperty
;
esxVI_DynamicProperty
*
dynamicProperty
;
...
@@ -1835,7 +1835,7 @@ esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName,
...
@@ -1835,7 +1835,7 @@ esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName,
}
}
if
(
*
value
==
esxVI_Boolean_Undefined
&&
if
(
*
value
==
esxVI_Boolean_Undefined
&&
occurence
==
esxVI_Occurrence_RequiredItem
)
{
occur
r
ence
==
esxVI_Occurrence_RequiredItem
)
{
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Missing '%s' property"
),
propertyName
);
_
(
"Missing '%s' property"
),
propertyName
);
return
-
1
;
return
-
1
;
...
@@ -1844,9 +1844,11 @@ esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName,
...
@@ -1844,9 +1844,11 @@ esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName,
return
0
;
return
0
;
}
}
int
int
esxVI_GetLong
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
esxVI_GetLong
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
esxVI_Long
**
value
,
esxVI_Occurrence
occurence
)
esxVI_Long
**
value
,
esxVI_Occurrence
occur
r
ence
)
{
{
esxVI_DynamicProperty
*
dynamicProperty
;
esxVI_DynamicProperty
*
dynamicProperty
;
...
@@ -1866,7 +1868,7 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName,
...
@@ -1866,7 +1868,7 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName,
}
}
}
}
if
(
*
value
==
NULL
&&
occurence
==
esxVI_Occurrence_RequiredItem
)
{
if
(
*
value
==
NULL
&&
occur
r
ence
==
esxVI_Occurrence_RequiredItem
)
{
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Missing '%s' property"
),
propertyName
);
_
(
"Missing '%s' property"
),
propertyName
);
return
-
1
;
return
-
1
;
...
@@ -1880,7 +1882,7 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName,
...
@@ -1880,7 +1882,7 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName,
int
int
esxVI_GetStringValue
(
esxVI_ObjectContent
*
objectContent
,
esxVI_GetStringValue
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
const
char
*
propertyName
,
char
**
value
,
esxVI_Occurrence
occurence
)
char
**
value
,
esxVI_Occurrence
occur
r
ence
)
{
{
esxVI_DynamicProperty
*
dynamicProperty
;
esxVI_DynamicProperty
*
dynamicProperty
;
...
@@ -1902,7 +1904,7 @@ esxVI_GetStringValue(esxVI_ObjectContent *objectContent,
...
@@ -1902,7 +1904,7 @@ esxVI_GetStringValue(esxVI_ObjectContent *objectContent,
}
}
}
}
if
(
*
value
==
NULL
&&
occurence
==
esxVI_Occurrence_RequiredItem
)
{
if
(
*
value
==
NULL
&&
occur
r
ence
==
esxVI_Occurrence_RequiredItem
)
{
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Missing '%s' property"
),
propertyName
);
_
(
"Missing '%s' property"
),
propertyName
);
return
-
1
;
return
-
1
;
...
@@ -1917,7 +1919,7 @@ int
...
@@ -1917,7 +1919,7 @@ int
esxVI_GetManagedObjectReference
(
esxVI_ObjectContent
*
objectContent
,
esxVI_GetManagedObjectReference
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
const
char
*
propertyName
,
esxVI_ManagedObjectReference
**
value
,
esxVI_ManagedObjectReference
**
value
,
esxVI_Occurrence
occurence
)
esxVI_Occurrence
occur
r
ence
)
{
{
esxVI_DynamicProperty
*
dynamicProperty
;
esxVI_DynamicProperty
*
dynamicProperty
;
...
@@ -1938,7 +1940,7 @@ esxVI_GetManagedObjectReference(esxVI_ObjectContent *objectContent,
...
@@ -1938,7 +1940,7 @@ esxVI_GetManagedObjectReference(esxVI_ObjectContent *objectContent,
}
}
}
}
if
(
*
value
==
NULL
&&
occurence
==
esxVI_Occurrence_RequiredItem
)
{
if
(
*
value
==
NULL
&&
occur
r
ence
==
esxVI_Occurrence_RequiredItem
)
{
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
ESX_VI_ERROR
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"Missing '%s' property"
),
propertyName
);
_
(
"Missing '%s' property"
),
propertyName
);
return
-
1
;
return
-
1
;
...
@@ -2265,9 +2267,10 @@ esxVI_GetSnapshotTreeBySnapshot
...
@@ -2265,9 +2267,10 @@ esxVI_GetSnapshotTreeBySnapshot
int
esxVI_LookupHostSystemProperties
(
esxVI_Context
*
ctx
,
int
esxVI_String
*
propertyNameList
,
esxVI_LookupHostSystemProperties
(
esxVI_Context
*
ctx
,
esxVI_ObjectContent
**
hostSystem
)
esxVI_String
*
propertyNameList
,
esxVI_ObjectContent
**
hostSystem
)
{
{
return
esxVI_LookupObjectContentByType
(
ctx
,
ctx
->
hostSystem
->
_reference
,
return
esxVI_LookupObjectContentByType
(
ctx
,
ctx
->
hostSystem
->
_reference
,
"HostSystem"
,
propertyNameList
,
"HostSystem"
,
propertyNameList
,
...
...
src/esx/esx_vi.h
浏览文件 @
6b6cb7ea
...
@@ -300,19 +300,19 @@ int esxVI_GetVirtualMachineQuestionInfo
...
@@ -300,19 +300,19 @@ int esxVI_GetVirtualMachineQuestionInfo
int
esxVI_GetBoolean
(
esxVI_ObjectContent
*
objectContent
,
int
esxVI_GetBoolean
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
const
char
*
propertyName
,
esxVI_Boolean
*
value
,
esxVI_Occurrence
occurence
);
esxVI_Boolean
*
value
,
esxVI_Occurrence
occur
r
ence
);
int
esxVI_GetLong
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
int
esxVI_GetLong
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
esxVI_Long
**
value
,
esxVI_Occurrence
occurence
);
esxVI_Long
**
value
,
esxVI_Occurrence
occur
r
ence
);
int
esxVI_GetStringValue
(
esxVI_ObjectContent
*
objectContent
,
int
esxVI_GetStringValue
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
const
char
*
propertyName
,
char
**
value
,
esxVI_Occurrence
occurence
);
char
**
value
,
esxVI_Occurrence
occur
r
ence
);
int
esxVI_GetManagedObjectReference
(
esxVI_ObjectContent
*
objectContent
,
int
esxVI_GetManagedObjectReference
(
esxVI_ObjectContent
*
objectContent
,
const
char
*
propertyName
,
const
char
*
propertyName
,
esxVI_ManagedObjectReference
**
value
,
esxVI_ManagedObjectReference
**
value
,
esxVI_Occurrence
occurence
);
esxVI_Occurrence
occur
r
ence
);
int
esxVI_LookupNumberOfDomainsByPowerState
int
esxVI_LookupNumberOfDomainsByPowerState
(
esxVI_Context
*
ctx
,
esxVI_VirtualMachinePowerState
powerState
,
(
esxVI_Context
*
ctx
,
esxVI_VirtualMachinePowerState
powerState
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录