[libvirt] [PATCH v3 10/48] remote: conditionalize IP socket usage in libvirtd daemon

[Christophe de Dinechin]

> On 30 Jul 2019, at 13:15, Andrea Bolognani <abologna at redhat.com> wrote:
> 
> On Tue, 2019-07-30 at 12:00 +0100, Daniel P. Berrangé wrote:
>> On Tue, Jul 30, 2019 at 12:46:31PM +0200, Christophe de Dinechin wrote:
>>> Daniel P. Berrangé writes:
>>>> @@ -381,11 +381,13 @@ static int ATTRIBUTE_NONNULL(3)
>>>> daemonSetupNetworking(virNetServerPtr srv,
>>>>                       virNetServerPtr srvAdm,
>>>>                       struct daemonConfig *config,
>>>> +#ifdef ENABLE_IP
>>>> +                      bool ipsock,
>>>> +                      bool privileged,
>>>> +#endif /* ! ENABLE_IP */
>>> 
>>> Absolute nit, but I would move the two bool last to avoid arch-dependent
>>> and config-dependent padding in the middle of the struct.
>> 
>> I moved them here, because if you have #ifdef conditional around
>> the last parameter in the function, the formatting gets messy
>> wrt to the closing ')', and need to trim the trailing ',' on the
>> previous parameter.
> 
> I think Christophe, despite the fact that he quoted the function
> signature, was actually referring to struct daemonConfig and the
> members within.

Indeed.

> 
> I'm not sure whether we care about the padding and relative alignment
> in this case, though.

“Absolute nit” :-)

> 
> -- 
> Andrea Bolognani / Red Hat / Virtualization
>