[libvirt] [PATCH 1/6] virNetDevMacVLanCreateWithVPortProfile: Turn vnet_hdr into flag

Michal Privoznik mprivozn at redhat.com
Mon Dec 7 10:58:10 UTC 2015


On 04.12.2015 16:41, Laine Stump wrote:
> On 12/04/2015 07:30 AM, Michal Privoznik wrote:
>> So yet again one of integer arguments that we use as a boolean.
>> Since the argument count of the function is unbearably long
>> enough, lets turn those booleans into flags.
>>
>> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>> ---
>>   src/lxc/lxc_process.c       | 2 +-
>>   src/qemu/qemu_command.c     | 5 ++---
>>   src/util/virnetdevmacvlan.c | 4 +---
>>   src/util/virnetdevmacvlan.h | 9 +++++----
>>   4 files changed, 9 insertions(+), 11 deletions(-)
>>


>> diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h
>> index 298e522..b04fc8c 100644
>> --- a/src/util/virnetdevmacvlan.h
>> +++ b/src/util/virnetdevmacvlan.h
>> @@ -41,11 +41,13 @@ typedef enum {
>>   VIR_ENUM_DECL(virNetDevMacVLanMode)
>>     typedef enum {
>> -   VIR_NETDEV_MACVLAN_CREATE_NONE     = 0,
>> +   VIR_NETDEV_MACVLAN_CREATE_NONE       = 0,
>>      /* Create with a tap device */
>> -   VIR_NETDEV_MACVLAN_CREATE_WITH_TAP = 1 << 0,
>> +   VIR_NETDEV_MACVLAN_CREATE_WITH_TAP   = 1 << 0,
>>      /* Bring the interface up */
>> -   VIR_NETDEV_MACVLAN_CREATE_IFUP     = 1 << 1,
>> +   VIR_NETDEV_MACVLAN_CREATE_IFUP       = 1 << 1,
>> +   /* Enable VNET_HDR */
>> +   VIR_NETDEV_MACVLAN_VNET_HDR          = 1 << 2,
>>   } virNetDevMacVLanCreateFlags;
> 
> Any reason for the alignment adjustment? If not, it's just fodder for
> creating merge conflicts later.

No, it's just because my TABs are that wide. Nevermind.

> 
> Aside from that, ACK.
> 

Michal




More information about the libvir-list mailing list