Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
6f5e6332
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,发现更多精彩内容 >>
提交
6f5e6332
编写于
11月 06, 2009
作者:
M
Matthias Bolte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
phyp: Don't use VIR_ALLOC if a stack variable is good enough
上级
64a4c60e
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
14 addition
and
33 deletion
+14
-33
src/phyp/phyp_driver.c
src/phyp/phyp_driver.c
+14
-33
未找到文件。
src/phyp/phyp_driver.c
浏览文件 @
6f5e6332
...
@@ -1131,29 +1131,21 @@ phypDomainLookupByName(virConnectPtr conn, const char *lpar_name)
...
@@ -1131,29 +1131,21 @@ phypDomainLookupByName(virConnectPtr conn, const char *lpar_name)
virDomainPtr
dom
=
NULL
;
virDomainPtr
dom
=
NULL
;
int
lpar_id
=
0
;
int
lpar_id
=
0
;
char
*
managed_system
=
phyp_driver
->
managed_system
;
char
*
managed_system
=
phyp_driver
->
managed_system
;
unsigned
char
*
lpar_uuid
=
NULL
;
unsigned
char
lpar_uuid
[
VIR_UUID_BUFLEN
];
if
(
VIR_ALLOC_N
(
lpar_uuid
,
VIR_UUID_BUFLEN
)
<
0
)
virReportOOMError
(
dom
->
conn
);
lpar_id
=
phypGetLparID
(
session
,
managed_system
,
lpar_name
,
conn
);
lpar_id
=
phypGetLparID
(
session
,
managed_system
,
lpar_name
,
conn
);
if
(
lpar_id
==
-
1
)
if
(
lpar_id
==
-
1
)
goto
err
;
return
NULL
;
if
(
phypGetLparUUID
(
lpar_uuid
,
lpar_id
,
conn
)
==
-
1
)
if
(
phypGetLparUUID
(
lpar_uuid
,
lpar_id
,
conn
)
==
-
1
)
goto
err
;
return
NULL
;
dom
=
virGetDomain
(
conn
,
lpar_name
,
lpar_uuid
);
dom
=
virGetDomain
(
conn
,
lpar_name
,
lpar_uuid
);
if
(
dom
)
if
(
dom
)
dom
->
id
=
lpar_id
;
dom
->
id
=
lpar_id
;
VIR_FREE
(
lpar_uuid
);
return
dom
;
return
dom
;
err:
VIR_FREE
(
lpar_uuid
);
return
NULL
;
}
}
static
virDomainPtr
static
virDomainPtr
...
@@ -1165,10 +1157,7 @@ phypDomainLookupByID(virConnectPtr conn, int lpar_id)
...
@@ -1165,10 +1157,7 @@ phypDomainLookupByID(virConnectPtr conn, int lpar_id)
virDomainPtr
dom
=
NULL
;
virDomainPtr
dom
=
NULL
;
char
*
managed_system
=
phyp_driver
->
managed_system
;
char
*
managed_system
=
phyp_driver
->
managed_system
;
int
exit_status
=
0
;
int
exit_status
=
0
;
unsigned
char
*
lpar_uuid
=
NULL
;
unsigned
char
lpar_uuid
[
VIR_UUID_BUFLEN
];
if
(
VIR_ALLOC_N
(
lpar_uuid
,
VIR_UUID_BUFLEN
)
<
0
)
virReportOOMError
(
dom
->
conn
);
char
*
lpar_name
=
phypGetLparNAME
(
session
,
managed_system
,
lpar_id
,
char
*
lpar_name
=
phypGetLparNAME
(
session
,
managed_system
,
lpar_id
,
conn
);
conn
);
...
@@ -1185,12 +1174,10 @@ phypDomainLookupByID(virConnectPtr conn, int lpar_id)
...
@@ -1185,12 +1174,10 @@ phypDomainLookupByID(virConnectPtr conn, int lpar_id)
dom
->
id
=
lpar_id
;
dom
->
id
=
lpar_id
;
VIR_FREE
(
lpar_name
);
VIR_FREE
(
lpar_name
);
VIR_FREE
(
lpar_uuid
);
return
dom
;
return
dom
;
err:
err:
VIR_FREE
(
lpar_name
);
VIR_FREE
(
lpar_name
);
VIR_FREE
(
lpar_uuid
);
return
NULL
;
return
NULL
;
}
}
...
@@ -1200,17 +1187,15 @@ phypDomainDumpXML(virDomainPtr dom, int flags)
...
@@ -1200,17 +1187,15 @@ phypDomainDumpXML(virDomainPtr dom, int flags)
ConnectionData
*
connection_data
=
dom
->
conn
->
networkPrivateData
;
ConnectionData
*
connection_data
=
dom
->
conn
->
networkPrivateData
;
phyp_driverPtr
phyp_driver
=
dom
->
conn
->
privateData
;
phyp_driverPtr
phyp_driver
=
dom
->
conn
->
privateData
;
LIBSSH2_SESSION
*
session
=
connection_data
->
session
;
LIBSSH2_SESSION
*
session
=
connection_data
->
session
;
virDomainDefPtr
def
=
NULL
;
virDomainDef
def
;
char
*
ret
=
NULL
;
char
*
managed_system
=
phyp_driver
->
managed_system
;
char
*
managed_system
=
phyp_driver
->
managed_system
;
if
(
VIR_ALLOC
(
def
)
<
0
)
memset
(
&
def
,
0
,
sizeof
(
virDomainDef
));
virReportOOMError
(
dom
->
conn
);
def
->
virtType
=
VIR_DOMAIN_VIRT_PHYP
;
def
.
virtType
=
VIR_DOMAIN_VIRT_PHYP
;
def
->
id
=
dom
->
id
;
def
.
id
=
dom
->
id
;
char
*
lpar_name
=
phypGetLparNAME
(
session
,
managed_system
,
def
->
id
,
char
*
lpar_name
=
phypGetLparNAME
(
session
,
managed_system
,
def
.
id
,
dom
->
conn
);
dom
->
conn
);
if
(
lpar_name
==
NULL
)
{
if
(
lpar_name
==
NULL
)
{
...
@@ -1218,36 +1203,32 @@ phypDomainDumpXML(virDomainPtr dom, int flags)
...
@@ -1218,36 +1203,32 @@ phypDomainDumpXML(virDomainPtr dom, int flags)
goto
err
;
goto
err
;
}
}
if
(
phypGetLparUUID
(
def
->
uuid
,
dom
->
id
,
dom
->
conn
)
==
-
1
)
{
if
(
phypGetLparUUID
(
def
.
uuid
,
dom
->
id
,
dom
->
conn
)
==
-
1
)
{
VIR_ERROR
(
"%s"
,
"Unable to generate random uuid."
);
VIR_ERROR
(
"%s"
,
"Unable to generate random uuid."
);
goto
err
;
goto
err
;
}
}
if
((
def
->
maxmem
=
if
((
def
.
maxmem
=
phypGetLparMem
(
dom
->
conn
,
managed_system
,
dom
->
id
,
0
))
==
0
)
{
phypGetLparMem
(
dom
->
conn
,
managed_system
,
dom
->
id
,
0
))
==
0
)
{
VIR_ERROR
(
"%s"
,
"Unable to determine domain's max memory."
);
VIR_ERROR
(
"%s"
,
"Unable to determine domain's max memory."
);
goto
err
;
goto
err
;
}
}
if
((
def
->
memory
=
if
((
def
.
memory
=
phypGetLparMem
(
dom
->
conn
,
managed_system
,
dom
->
id
,
1
))
==
0
)
{
phypGetLparMem
(
dom
->
conn
,
managed_system
,
dom
->
id
,
1
))
==
0
)
{
VIR_ERROR
(
"%s"
,
"Unable to determine domain's memory."
);
VIR_ERROR
(
"%s"
,
"Unable to determine domain's memory."
);
goto
err
;
goto
err
;
}
}
if
((
def
->
vcpus
=
if
((
def
.
vcpus
=
phypGetLparCPU
(
dom
->
conn
,
managed_system
,
dom
->
id
))
==
0
)
{
phypGetLparCPU
(
dom
->
conn
,
managed_system
,
dom
->
id
))
==
0
)
{
VIR_ERROR
(
"%s"
,
"Unable to determine domain's CPU."
);
VIR_ERROR
(
"%s"
,
"Unable to determine domain's CPU."
);
goto
err
;
goto
err
;
}
}
ret
=
virDomainDefFormat
(
dom
->
conn
,
def
,
flags
);
return
virDomainDefFormat
(
dom
->
conn
,
&
def
,
flags
);
virDomainDefFree
(
def
);
return
ret
;
err:
err:
virDomainDefFree
(
def
);
return
NULL
;
return
NULL
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录