On 09/12/2012 12:00 PM, Laine Stump wrote:
On 09/12/2012 12:57 PM, Eric Blake wrote:
> I got an off-list report about a bad diagnostic:
> Target network card mac 52:54:00:49:07:ccdoes not match source 52:54:00:49:07:b8
>
> True to form, I've added a syntax check rule to prevent it
> from recurring, and found several other offenders.
>
> virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> - _("Target device PCI address %04x:%02x:%02x.%02x
does not match source %04x:%02x:%02x.%02x"),
> + _("Target device PCI address %04x:%02x:%02x.%02x
"
> + "does not match source
%04x:%02x:%02x.%02x"),
> dst->addr.pci.domain, dst->addr.pci.bus,
> dst->addr.pci.slot, dst->addr.pci.function,
> src->addr.pci.domain, src->addr.pci.bus,
> @@ -10044,7 +10045,7 @@ static bool
virDomainNetDefCheckABIStability(virDomainNetDefPtr src,
> if (virMacAddrCmp(&src->mac, &dst->mac) != 0) {
> virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> _("Target network card mac
%02x:%02x:%02x:%02x:%02x:%02x"
> - "does not match source
%02x:%02x:%02x:%02x:%02x:%02x"),
> + " does not match source
%02x:%02x:%02x:%02x:%02x:%02x"),
I curious if there's any reason why you added a space at the end of the
first line in all other cases, but at the beginning of the 2nd line in
this case (I suppose if nothing else, it proves that your syntax-check
rule works correctly in both cases :-)
That, and to fit the first line in 80 columns in the instance where I
put the space at the front (the second line is 81 columns, but that
didn't look quite as bad).
At any rate, ACK.
Thanks; pushed.
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org