Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
0d013184
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,发现更多精彩内容 >>
提交
0d013184
编写于
5月 03, 2013
作者:
M
Michal Privoznik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adapt to VIR_STRDUP and VIR_STRNDUP in src/cpu/*
上级
df5c9e69
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
17 deletion
+17
-17
src/cpu/cpu_generic.c
src/cpu/cpu_generic.c
+4
-4
src/cpu/cpu_map.c
src/cpu/cpu_map.c
+2
-1
src/cpu/cpu_powerpc.c
src/cpu/cpu_powerpc.c
+6
-7
src/cpu/cpu_x86.c
src/cpu/cpu_x86.c
+5
-5
未找到文件。
src/cpu/cpu_generic.c
浏览文件 @
0d013184
...
...
@@ -28,7 +28,7 @@
#include "virhash.h"
#include "cpu.h"
#include "cpu_generic.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_CPU
...
...
@@ -131,7 +131,7 @@ genericBaseline(virCPUDefPtr *cpus,
}
if
(
VIR_ALLOC
(
cpu
)
<
0
||
!
(
cpu
->
model
=
strdup
(
cpus
[
0
]
->
model
))
||
VIR_STRDUP
(
cpu
->
model
,
cpus
[
0
]
->
model
)
<
0
||
VIR_ALLOC_N
(
features
,
cpus
[
0
]
->
nfeatures
)
<
0
)
goto
no_memory
;
...
...
@@ -183,8 +183,8 @@ genericBaseline(virCPUDefPtr *cpus,
if
(
!
features
[
i
].
name
)
continue
;
if
(
!
(
cpu
->
features
[
j
++
].
name
=
strdup
(
features
[
i
].
name
))
)
goto
no_memory
;
if
(
VIR_STRDUP
(
cpu
->
features
[
j
++
].
name
,
features
[
i
].
name
)
<
0
)
goto
error
;
}
cleanup:
...
...
src/cpu/cpu_map.c
浏览文件 @
0d013184
...
...
@@ -27,6 +27,7 @@
#include "cpu.h"
#include "cpu_map.h"
#include "configmake.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_CPU
...
...
@@ -149,7 +150,7 @@ cpuMapOverride(const char *path)
{
char
*
map
;
if
(
!
(
map
=
strdup
(
path
))
)
if
(
VIR_STRDUP
(
map
,
path
)
<
0
)
return
-
1
;
VIR_FREE
(
cpumap
);
...
...
src/cpu/cpu_powerpc.c
浏览文件 @
0d013184
...
...
@@ -29,7 +29,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "cpu.h"
#include "virstring.h"
#include "cpu_map.h"
#include "virbuffer.h"
...
...
@@ -333,9 +333,8 @@ ppcDecode(virCPUDefPtr cpu,
goto
cleanup
;
}
if
(
!
(
cpu
->
model
=
strdup
(
model
->
name
))
||
(
model
->
vendor
&&
!
(
cpu
->
vendor
=
strdup
(
model
->
vendor
->
name
))))
{
virReportOOMError
();
if
(
VIR_STRDUP
(
cpu
->
model
,
model
->
name
)
<
0
||
(
model
->
vendor
&&
VIR_STRDUP
(
cpu
->
vendor
,
model
->
vendor
->
name
)
<
0
))
{
goto
cleanup
;
}
...
...
@@ -449,11 +448,11 @@ ppcBaseline(virCPUDefPtr *cpus,
}
if
(
VIR_ALLOC
(
cpu
)
<
0
||
!
(
cpu
->
model
=
strdup
(
model
->
name
))
)
VIR_STRDUP
(
cpu
->
model
,
model
->
name
)
<
0
)
goto
no_memory
;
if
(
vendor
&&
!
(
cpu
->
vendor
=
strdup
(
vendor
->
name
))
)
goto
no_memory
;
if
(
vendor
&&
VIR_STRDUP
(
cpu
->
vendor
,
vendor
->
name
)
<
0
)
goto
error
;
cpu
->
type
=
VIR_CPU_TYPE_GUEST
;
cpu
->
match
=
VIR_CPU_MATCH_EXACT
;
...
...
src/cpu/cpu_x86.c
浏览文件 @
0d013184
...
...
@@ -449,13 +449,13 @@ x86DataToCPU(const union cpuData *data,
const
struct
x86_vendor
*
vendor
;
if
(
VIR_ALLOC
(
cpu
)
<
0
||
!
(
cpu
->
model
=
strdup
(
model
->
name
))
||
VIR_STRDUP
(
cpu
->
model
,
model
->
name
)
<
0
||
!
(
copy
=
x86DataCopy
(
data
))
||
!
(
modelData
=
x86DataCopy
(
model
->
data
)))
goto
no_memory
;
if
((
vendor
=
x86DataToVendor
(
copy
,
map
))
&&
!
(
cpu
->
vendor
=
strdup
(
vendor
->
name
))
)
VIR_STRDUP
(
cpu
->
vendor
,
vendor
->
name
)
<
0
)
goto
no_memory
;
x86DataSubtract
(
copy
,
modelData
);
...
...
@@ -766,9 +766,9 @@ x86ModelCopy(const struct x86_model *model)
{
struct
x86_model
*
copy
;
if
(
VIR_ALLOC
(
copy
)
<
0
||
!
(
copy
->
name
=
strdup
(
model
->
name
))
||
!
(
copy
->
data
=
x86DataCopy
(
model
->
data
)))
{
if
(
VIR_ALLOC
(
copy
)
<
0
||
VIR_STRDUP
(
copy
->
name
,
model
->
name
)
<
0
||
!
(
copy
->
data
=
x86DataCopy
(
model
->
data
)))
{
x86ModelFree
(
copy
);
return
NULL
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录