Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
bb66d93c
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看板
提交
bb66d93c
编写于
6月 30, 2015
作者:
A
Andrea Bolognani
提交者:
Erik Skultety
6月 30, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typo incomaptible -> incompatible
上级
365b454e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
7 deletion
+7
-7
src/cpu/cpu_x86.c
src/cpu/cpu_x86.c
+2
-2
src/libvirt-domain-snapshot.c
src/libvirt-domain-snapshot.c
+1
-1
src/qemu/qemu_driver.c
src/qemu/qemu_driver.c
+4
-4
未找到文件。
src/cpu/cpu_x86.c
浏览文件 @
bb66d93c
...
...
@@ -1507,14 +1507,14 @@ x86Compute(virCPUDefPtr host,
static
virCPUCompareResult
x86Compare
(
virCPUDefPtr
host
,
virCPUDefPtr
cpu
,
bool
failIncom
ap
tible
)
bool
failIncom
pa
tible
)
{
virCPUCompareResult
ret
;
char
*
message
=
NULL
;
ret
=
x86Compute
(
host
,
cpu
,
NULL
,
&
message
);
if
(
failIncom
ap
tible
&&
ret
==
VIR_CPU_COMPARE_INCOMPATIBLE
)
{
if
(
failIncom
pa
tible
&&
ret
==
VIR_CPU_COMPARE_INCOMPATIBLE
)
{
ret
=
VIR_CPU_COMPARE_ERROR
;
if
(
message
)
{
virReportError
(
VIR_ERR_CPU_INCOMPATIBLE
,
"%s"
,
message
);
...
...
src/libvirt-domain-snapshot.c
浏览文件 @
bb66d93c
...
...
@@ -1048,7 +1048,7 @@ virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot,
* new hypervisor instance rather than reusing the existing hypervisor
* (since this would terminate all connections to the domain, such as
* such as VNC or Spice graphics) - this condition arises from active
* snapshots that are provably ABI incom
ap
tible, as well as from
* snapshots that are provably ABI incom
pa
tible, as well as from
* inactive snapshots with a @flags request to start the domain after
* the revert.
*
...
...
src/qemu/qemu_driver.c
浏览文件 @
bb66d93c
...
...
@@ -12948,7 +12948,7 @@ qemuConnectCompareCPU(virConnectPtr conn,
virQEMUDriverPtr driver = conn->privateData;
int ret = VIR_CPU_COMPARE_ERROR;
virCapsPtr caps = NULL;
bool failIncom
ap
tible;
bool failIncom
pa
tible;
virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE,
VIR_CPU_COMPARE_ERROR);
...
...
@@ -12956,14 +12956,14 @@ qemuConnectCompareCPU(virConnectPtr conn,
if (virConnectCompareCPUEnsureACL(conn) < 0)
goto cleanup;
failIncom
ap
tible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE);
failIncom
pa
tible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE);
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
if (!caps->host.cpu ||
!caps->host.cpu->model) {
if (failIncom
ap
tible) {
if (failIncom
pa
tible) {
virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
_("cannot get host CPU capabilities"));
} else {
...
...
@@ -12971,7 +12971,7 @@ qemuConnectCompareCPU(virConnectPtr conn,
ret = VIR_CPU_COMPARE_INCOMPATIBLE;
}
} else {
ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncom
ap
tible);
ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncom
pa
tible);
}
cleanup:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录