提交 bb66d93c 编写于 作者: A Andrea Bolognani 提交者: Erik Skultety

Fix typo incomaptible -> incompatible

上级 365b454e
...@@ -1507,14 +1507,14 @@ x86Compute(virCPUDefPtr host, ...@@ -1507,14 +1507,14 @@ x86Compute(virCPUDefPtr host,
static virCPUCompareResult static virCPUCompareResult
x86Compare(virCPUDefPtr host, x86Compare(virCPUDefPtr host,
virCPUDefPtr cpu, virCPUDefPtr cpu,
bool failIncomaptible) bool failIncompatible)
{ {
virCPUCompareResult ret; virCPUCompareResult ret;
char *message = NULL; char *message = NULL;
ret = x86Compute(host, cpu, NULL, &message); ret = x86Compute(host, cpu, NULL, &message);
if (failIncomaptible && ret == VIR_CPU_COMPARE_INCOMPATIBLE) { if (failIncompatible && ret == VIR_CPU_COMPARE_INCOMPATIBLE) {
ret = VIR_CPU_COMPARE_ERROR; ret = VIR_CPU_COMPARE_ERROR;
if (message) { if (message) {
virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message); virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
......
...@@ -1048,7 +1048,7 @@ virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, ...@@ -1048,7 +1048,7 @@ virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot,
* new hypervisor instance rather than reusing the existing hypervisor * new hypervisor instance rather than reusing the existing hypervisor
* (since this would terminate all connections to the domain, such as * (since this would terminate all connections to the domain, such as
* such as VNC or Spice graphics) - this condition arises from active * such as VNC or Spice graphics) - this condition arises from active
* snapshots that are provably ABI incomaptible, as well as from * snapshots that are provably ABI incompatible, as well as from
* inactive snapshots with a @flags request to start the domain after * inactive snapshots with a @flags request to start the domain after
* the revert. * the revert.
* *
......
...@@ -12948,7 +12948,7 @@ qemuConnectCompareCPU(virConnectPtr conn, ...@@ -12948,7 +12948,7 @@ qemuConnectCompareCPU(virConnectPtr conn,
virQEMUDriverPtr driver = conn->privateData; virQEMUDriverPtr driver = conn->privateData;
int ret = VIR_CPU_COMPARE_ERROR; int ret = VIR_CPU_COMPARE_ERROR;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
bool failIncomaptible; bool failIncompatible;
virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE, virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE,
VIR_CPU_COMPARE_ERROR); VIR_CPU_COMPARE_ERROR);
...@@ -12956,14 +12956,14 @@ qemuConnectCompareCPU(virConnectPtr conn, ...@@ -12956,14 +12956,14 @@ qemuConnectCompareCPU(virConnectPtr conn,
if (virConnectCompareCPUEnsureACL(conn) < 0) if (virConnectCompareCPUEnsureACL(conn) < 0)
goto cleanup; goto cleanup;
failIncomaptible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE); failIncompatible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE);
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup; goto cleanup;
if (!caps->host.cpu || if (!caps->host.cpu ||
!caps->host.cpu->model) { !caps->host.cpu->model) {
if (failIncomaptible) { if (failIncompatible) {
virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
_("cannot get host CPU capabilities")); _("cannot get host CPU capabilities"));
} else { } else {
...@@ -12971,7 +12971,7 @@ qemuConnectCompareCPU(virConnectPtr conn, ...@@ -12971,7 +12971,7 @@ qemuConnectCompareCPU(virConnectPtr conn,
ret = VIR_CPU_COMPARE_INCOMPATIBLE; ret = VIR_CPU_COMPARE_INCOMPATIBLE;
} }
} else { } else {
ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncomaptible); ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncompatible);
} }
cleanup: cleanup:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册