[libvirt] [PATCH] Convert 'raw MAC address' usages to use virMacAddr

[Stefan Berger]

On 06/04/2012 07:26 PM, Eric Blake wrote:
> On 06/03/2012 07:08 PM, Stefan Berger wrote:
>> Introduce new members in the virMacAddr 'class':
>> - virMacAddrSet: set virMacAddr from a virMacAddr
>> - virMacAddrSetRaw: setting virMacAddr from raw 6 byte MAC address buffer
>> - virMacAddrGetRaw: writing virMacAddr into raw 6 byte MAC address buffer
>> - virMacAddrCmp: comparing two virMacAddr
>> - virMacAddrCmpRaw: comparing a virMacAddr with a raw 6 byte MAC address
>> buffer
>>
>> then replace raw MAC addresses by replacing
>>
>> - 'unsigned char *' with virMacAddrPtr
>> - 'unsigned char ... [VIR_MAC_BUFLEN]' with virMacAddr
>>
>> and introduce usage of above functions where necessary.
> Unfortunately, I tried applying this patch, but it failed:
>
> $ git am -3 ../virMacAddr.eml
> Applying: Convert 'raw MAC address' usages to use virMacAddr
> fatal: corrupt patch at line 91
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 Convert 'raw MAC address' usages to use virMacAddr
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
>
> Can you investigate what might have happened on your end?

It sits on top of 5/5 of the DHCP snooping patches. It doesn't apply 
without it due to changes it makes to that code as well. I'll wait for 
that one to go in first and then I'll post again.

I fixed the things you mentioned. Maybe some of the one-line functions 
should be inlines?

    Stefan