[libvirt] [PATCH v3 15/36] network: make networkLogAllocation independent of domain conf

[Laine Stump]

On 3/19/19 8:46 AM, Daniel P. Berrangé wrote:
> Stop passing a virDomainNetDefPtr parameter to networkLogAllocation,
> instead just pass in the MAC address. The actual device type is also not
> required, since virNetworkForwardIfDefPtr has a type field that can be
> used instad.
>
> Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>


Reviewed-by: Laine Stump <laine at laine.org>


> ---
>   src/network/bridge_driver.c | 21 +++++++++------------
>   1 file changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
> index d4ca2930cc..9eda1c62b0 100644
> --- a/src/network/bridge_driver.c
> +++ b/src/network/bridge_driver.c
> @@ -4313,32 +4313,29 @@ networkGetDHCPLeases(virNetworkPtr net,
>   
>   static void
>   networkLogAllocation(virNetworkDefPtr netdef,
> -                     virDomainNetType actualType,
>                        virNetworkForwardIfDefPtr dev,
> -                     virDomainNetDefPtr iface,
> +                     virMacAddrPtr mac,
>                        bool inUse)
>   {
>       char macStr[VIR_MAC_STRING_BUFLEN];
>       const char *verb = inUse ? "using" : "releasing";
>   
> +    virMacAddrFormat(mac, macStr);
>       if (!dev) {
>           VIR_INFO("MAC %s %s network %s (%d connections)",
> -                 virMacAddrFormat(&iface->mac, macStr), verb,
> -                 netdef->name, netdef->connections);
> +                 macStr, verb, netdef->name, netdef->connections);
>       } else {
> -        if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
> +        if (dev->type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI) {
>               VIR_INFO("MAC %s %s network %s (%d connections) "
>                        "physical device %04x:%02x:%02x.%x (%d connections)",
> -                     virMacAddrFormat(&iface->mac, macStr), verb,
> -                     netdef->name, netdef->connections,
> +                     macStr, verb, netdef->name, netdef->connections,
>                        dev->device.pci.domain, dev->device.pci.bus,
>                        dev->device.pci.slot, dev->device.pci.function,
>                        dev->connections);
>           } else {
>               VIR_INFO("MAC %s %s network %s (%d connections) "
>                        "physical device %s (%d connections)",
> -                     virMacAddrFormat(&iface->mac, macStr), verb,
> -                     netdef->name, netdef->connections,
> +                     macStr, verb, netdef->name, netdef->connections,
>                        dev->device.dev, dev->connections);
>           }
>       }
> @@ -4747,7 +4744,7 @@ networkAllocateActualDevice(virNetworkPtr net,
>               dev->connections--;
>           goto error;
>       }
> -    networkLogAllocation(netdef, actualType, dev, iface, true);
> +    networkLogAllocation(netdef, dev, &iface->mac, true);
>   
>       ret = 0;
>   
> @@ -4938,7 +4935,7 @@ networkNotifyActualDevice(virNetworkPtr net,
>           netdef->connections--;
>           goto error;
>       }
> -    networkLogAllocation(netdef, actualType, dev, iface, true);
> +    networkLogAllocation(netdef, dev, &iface->mac, true);
>       ret = 0;
>   
>    cleanup:
> @@ -5105,7 +5102,7 @@ networkReleaseActualDevice(virNetworkPtr net,
>           /* finally we can call the 'unplugged' hook script if any */
>           networkRunHook(obj, dom, iface, VIR_HOOK_NETWORK_OP_IFACE_UNPLUGGED,
>                          VIR_HOOK_SUBOP_BEGIN);
> -        networkLogAllocation(netdef, actualType, dev, iface, false);
> +        networkLogAllocation(netdef, dev, &iface->mac, false);
>       }
>       ret = 0;
>    cleanup: