On 30/06/15 10:53, Andrea Bolognani wrote:
> ---
> src/cpu/cpu_x86.c | 4 ++--
> src/libvirt-domain-snapshot.c | 2 +-
> src/qemu/qemu_driver.c | 8 ++++----
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
> index 2a14705..f5f7697 100644
> --- a/src/cpu/cpu_x86.c
> +++ b/src/cpu/cpu_x86.c
> @@ -1507,14 +1507,14 @@ x86Compute(virCPUDefPtr host,
> static virCPUCompareResult
> x86Compare(virCPUDefPtr host,
> virCPUDefPtr cpu,
> - bool failIncomaptible)
> + bool failIncompatible)
> {
> virCPUCompareResult ret;
> char *message = NULL;
>
> 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;
> if (message) {
> virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
> diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c
> index 4625e03..b7c566f 100644
> --- a/src/libvirt-domain-snapshot.c
> +++ b/src/libvirt-domain-snapshot.c
> @@ -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 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
> * the revert.
> *
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 2b530c8..bdf9b15 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -12948,7 +12948,7 @@ qemuConnectCompareCPU(virConnectPtr conn,
> virQEMUDriverPtr driver = conn->privateData;
> int ret = VIR_CPU_COMPARE_ERROR;
> virCapsPtr caps = NULL;
> - bool failIncomaptible;
> + bool failIncompatible;
>
> virCheckFlags(VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE,
> VIR_CPU_COMPARE_ERROR);
> @@ -12956,14 +12956,14 @@ qemuConnectCompareCPU(virConnectPtr conn,
> if (virConnectCompareCPUEnsureACL(conn) < 0)
> goto cleanup;
>
> - failIncomaptible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE);
> + failIncompatible = !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATIBLE);
>
> if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
> goto cleanup;
>
> if (!caps->host.cpu ||
> !caps->host.cpu->model) {
> - if (failIncomaptible) {
> + if (failIncompatible) {
> 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, failIncomaptible);
> + ret = cpuCompareXML(caps->host.cpu, xmlDesc, failIncompatible);
> }
>
> cleanup:
>
Safe for freeze, ACK and pushed. Good eyes btw... ;)
Erik
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list