Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
46c49a30
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,发现更多精彩内容 >>
提交
46c49a30
编写于
8月 08, 2016
作者:
J
Jiri Denemark
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cpu: Rename cpuHasFeature to virCPUDataCheckFeature
Signed-off-by:
N
Jiri Denemark
<
jdenemar@redhat.com
>
上级
6b159239
变更
12
显示空白变更内容
内联
并排
Showing
12 changed file
with
25 addition
and
28 deletion
+25
-28
src/cpu/cpu.c
src/cpu/cpu.c
+5
-5
src/cpu/cpu.h
src/cpu/cpu.h
+5
-5
src/cpu/cpu_arm.c
src/cpu/cpu_arm.c
+0
-1
src/cpu/cpu_ppc64.c
src/cpu/cpu_ppc64.c
+0
-1
src/cpu/cpu_s390.c
src/cpu/cpu_s390.c
+0
-1
src/cpu/cpu_x86.c
src/cpu/cpu_x86.c
+3
-3
src/libvirt_private.syms
src/libvirt_private.syms
+1
-1
src/qemu/qemu_command.c
src/qemu/qemu_command.c
+1
-1
src/qemu/qemu_parse_command.c
src/qemu/qemu_parse_command.c
+1
-1
src/qemu/qemu_process.c
src/qemu/qemu_process.c
+5
-5
src/vmware/vmware_conf.c
src/vmware/vmware_conf.c
+3
-3
tests/cputest.c
tests/cputest.c
+1
-1
未找到文件。
src/cpu/cpu.c
浏览文件 @
46c49a30
...
...
@@ -648,7 +648,7 @@ virCPUUpdate(virArch arch,
/**
*
cpuHas
Feature:
*
virCPUDataCheck
Feature:
*
* @data: internal CPU representation
* @feature: feature to be checked for
...
...
@@ -659,7 +659,7 @@ virCPUUpdate(virArch arch,
* -1 on error.
*/
int
cpuHas
Feature
(
const
virCPUData
*
data
,
virCPUDataCheck
Feature
(
const
virCPUData
*
data
,
const
char
*
feature
)
{
struct
cpuArchDriver
*
driver
;
...
...
@@ -669,14 +669,14 @@ cpuHasFeature(const virCPUData *data,
if
((
driver
=
cpuGetSubDriver
(
data
->
arch
))
==
NULL
)
return
-
1
;
if
(
driver
->
hasFeature
==
NULL
)
{
if
(
!
driver
->
dataCheckFeature
)
{
virReportError
(
VIR_ERR_NO_SUPPORT
,
_
(
"cannot check guest CPU data for %s architecture"
),
virArchToString
(
data
->
arch
));
return
-
1
;
}
return
driver
->
has
Feature
(
data
,
feature
);
return
driver
->
dataCheck
Feature
(
data
,
feature
);
}
...
...
src/cpu/cpu.h
浏览文件 @
46c49a30
...
...
@@ -91,7 +91,7 @@ typedef int
const
virCPUDef
*
host
);
typedef
int
(
*
cpuArchHasFeature
)
(
const
virCPUData
*
data
,
(
*
virCPUArchDataCheckFeature
)
(
const
virCPUData
*
data
,
const
char
*
feature
);
typedef
char
*
...
...
@@ -120,7 +120,7 @@ struct cpuArchDriver {
cpuArchGuestData
guestData
;
cpuArchBaseline
baseline
;
virCPUArchUpdate
update
;
cpuArchHasFeature
has
Feature
;
virCPUArchDataCheckFeature
dataCheck
Feature
;
cpuArchDataFormat
dataFormat
;
cpuArchDataParse
dataParse
;
cpuArchGetModels
getModels
;
...
...
@@ -194,7 +194,7 @@ virCPUUpdate(virArch arch,
ATTRIBUTE_NONNULL
(
2
);
int
cpuHas
Feature
(
const
virCPUData
*
data
,
virCPUDataCheck
Feature
(
const
virCPUData
*
data
,
const
char
*
feature
)
ATTRIBUTE_NONNULL
(
1
)
ATTRIBUTE_NONNULL
(
2
);
...
...
src/cpu/cpu_arm.c
浏览文件 @
46c49a30
...
...
@@ -131,5 +131,4 @@ struct cpuArchDriver cpuDriverArm = {
.
guestData
=
armGuestData
,
.
baseline
=
armBaseline
,
.
update
=
virCPUarmUpdate
,
.
hasFeature
=
NULL
,
};
src/cpu/cpu_ppc64.c
浏览文件 @
46c49a30
...
...
@@ -910,6 +910,5 @@ struct cpuArchDriver cpuDriverPPC64 = {
.
guestData
=
ppc64DriverGuestData
,
.
baseline
=
ppc64DriverBaseline
,
.
update
=
virCPUppc64Update
,
.
hasFeature
=
NULL
,
.
getModels
=
ppc64DriverGetModels
,
};
src/cpu/cpu_s390.c
浏览文件 @
46c49a30
...
...
@@ -83,5 +83,4 @@ struct cpuArchDriver cpuDriverS390 = {
.
guestData
=
NULL
,
.
baseline
=
NULL
,
.
update
=
NULL
,
.
hasFeature
=
NULL
,
};
src/cpu/cpu_x86.c
浏览文件 @
46c49a30
...
...
@@ -2602,7 +2602,7 @@ virCPUx86Update(virCPUDefPtr guest,
static
int
x86Has
Feature
(
const
virCPUData
*
data
,
virCPUx86DataCheck
Feature
(
const
virCPUData
*
data
,
const
char
*
name
)
{
virCPUx86MapPtr
map
;
...
...
@@ -2709,7 +2709,7 @@ struct cpuArchDriver cpuDriverX86 = {
.
guestData
=
x86GuestData
,
.
baseline
=
x86Baseline
,
.
update
=
virCPUx86Update
,
.
hasFeature
=
x86Has
Feature
,
.
dataCheckFeature
=
virCPUx86DataCheck
Feature
,
.
dataFormat
=
x86CPUDataFormat
,
.
dataParse
=
x86CPUDataParse
,
.
getModels
=
x86GetModels
,
...
...
src/libvirt_private.syms
浏览文件 @
46c49a30
...
...
@@ -979,8 +979,8 @@ cpuDecode;
cpuEncode;
cpuGetModels;
cpuGuestData;
cpuHasFeature;
cpuNodeData;
virCPUDataCheckFeature;
virCPUTranslate;
virCPUUpdate;
...
...
src/qemu/qemu_command.c
浏览文件 @
46c49a30
...
...
@@ -6580,7 +6580,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
*/
if
((
def
->
os
.
arch
==
VIR_ARCH_X86_64
||
def
->
os
.
arch
==
VIR_ARCH_I686
)
&&
compareAgainstHost
)
{
int
hasSVM
=
cpuHas
Feature
(
data
,
"svm"
);
int
hasSVM
=
virCPUDataCheck
Feature
(
data
,
"svm"
);
if
(
hasSVM
<
0
)
goto
cleanup
;
*
hasHwVirt
=
hasSVM
>
0
?
true
:
false
;
...
...
src/qemu/qemu_parse_command.c
浏览文件 @
46c49a30
...
...
@@ -1605,7 +1605,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
NULL
,
NULL
,
NULL
,
NULL
)
<
0
)
goto
cleanup
;
is_32bit
=
(
cpuHas
Feature
(
cpuData
,
"lm"
)
!=
1
);
is_32bit
=
(
virCPUDataCheck
Feature
(
cpuData
,
"lm"
)
!=
1
);
cpuDataFree
(
cpuData
);
}
else
if
(
model
)
{
is_32bit
=
STREQ
(
model
,
"qemu32"
);
...
...
src/qemu/qemu_process.c
浏览文件 @
46c49a30
...
...
@@ -3702,7 +3702,7 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver,
}
if
(
def
->
features
[
VIR_DOMAIN_FEATURE_PVSPINLOCK
]
==
VIR_TRISTATE_SWITCH_ON
)
{
if
(
!
cpuHas
Feature
(
guestcpu
,
VIR_CPU_x86_KVM_PV_UNHALT
))
{
if
(
!
virCPUDataCheck
Feature
(
guestcpu
,
VIR_CPU_x86_KVM_PV_UNHALT
))
{
virReportError
(
VIR_ERR_CONFIG_UNSUPPORTED
,
"%s"
,
_
(
"host doesn't support paravirtual spinlocks"
));
goto
cleanup
;
...
...
@@ -3715,7 +3715,7 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver,
if
(
virAsprintf
(
&
cpuFeature
,
"__kvm_hv_%s"
,
virDomainHypervTypeToString
(
i
))
<
0
)
goto
cleanup
;
if
(
!
cpuHas
Feature
(
guestcpu
,
cpuFeature
))
{
if
(
!
virCPUDataCheck
Feature
(
guestcpu
,
cpuFeature
))
{
switch
((
virDomainHyperv
)
i
)
{
case
VIR_DOMAIN_HYPERV_RELAXED
:
case
VIR_DOMAIN_HYPERV_VAPIC
:
...
...
@@ -3751,7 +3751,7 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver,
continue
;
if
(
STREQ
(
feature
->
name
,
"invtsc"
)
&&
!
cpuHas
Feature
(
guestcpu
,
feature
->
name
))
{
!
virCPUDataCheck
Feature
(
guestcpu
,
feature
->
name
))
{
virReportError
(
VIR_ERR_CONFIG_UNSUPPORTED
,
"%s"
,
_
(
"host doesn't support invariant TSC"
));
goto
cleanup
;
...
...
@@ -4530,8 +4530,8 @@ qemuProcessStartValidateGuestCPU(virDomainObjPtr vm,
case
VIR_CPU_COMPARE_INCOMPATIBLE
:
if
(
cpuEncode
(
host
->
arch
,
host
,
NULL
,
&
hostData
,
NULL
,
NULL
,
NULL
,
NULL
)
==
0
&&
(
!
cpuHas
Feature
(
hostData
,
"hle"
)
||
!
cpuHas
Feature
(
hostData
,
"rtm"
))
&&
(
!
virCPUDataCheck
Feature
(
hostData
,
"hle"
)
||
!
virCPUDataCheck
Feature
(
hostData
,
"rtm"
))
&&
(
STREQ_NULLABLE
(
cpu
->
model
,
"Haswell"
)
||
STREQ_NULLABLE
(
cpu
->
model
,
"Broadwell"
)))
noTSX
=
true
;
...
...
src/vmware/vmware_conf.c
浏览文件 @
46c49a30
...
...
@@ -100,9 +100,9 @@ vmwareCapsInit(void)
* - Host CPU is x86_64 with virtualization extensions
*/
if
(
caps
->
host
.
arch
==
VIR_ARCH_X86_64
||
(
cpuHas
Feature
(
data
,
"lm"
)
&&
(
cpuHas
Feature
(
data
,
"vmx"
)
||
cpuHas
Feature
(
data
,
"svm"
))))
{
(
virCPUDataCheck
Feature
(
data
,
"lm"
)
&&
(
virCPUDataCheck
Feature
(
data
,
"vmx"
)
||
virCPUDataCheck
Feature
(
data
,
"svm"
))))
{
if
((
guest
=
virCapabilitiesAddGuest
(
caps
,
VIR_DOMAIN_OSTYPE_HVM
,
...
...
tests/cputest.c
浏览文件 @
46c49a30
...
...
@@ -430,7 +430,7 @@ cpuTestHasFeature(const void *arg)
NULL
,
NULL
,
NULL
,
NULL
)
<
0
)
goto
cleanup
;
result
=
cpuHas
Feature
(
hostData
,
data
->
name
);
result
=
virCPUDataCheck
Feature
(
hostData
,
data
->
name
);
if
(
data
->
result
==
-
1
)
virResetLastError
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录