Re: [libvirt] [PATCH 5/6] Convert CPU APIs to use virArch
On Tue, Dec 11, 2012 at 14:53:40 +0000, Daniel P. Berrange wrote:
...
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 8cb54a3..2b3b44d 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
...
@@ -740,10 +745,11 @@ virCPUDefIsEqual(virCPUDefPtr src,
goto cleanup;
}
- if (STRNEQ_NULLABLE(src->arch, dst->arch)) {
+ if (src->arch != dst->arch) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target CPU arch %s does not match source %s"),
- NULLSTR(dst->arch), NULLSTR(src->arch));
+ virArchToString(dst->arch),
+ virArchToString(src->arch));
Hmm, I wonder if VIR_ARCH_NONE should have its name set to "none" rather
than "" in patch 1 to provide better error or debugging messages. It
should not have any ill side effects I believe.
goto cleanup;
}
ACK
Jirka