mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-17 12:18:06 +02:00
680c95ddd2
Use the nm_device_get_type_desc_for_log() helper function defined earlier to show the device type when it can be ambiguous. With this, the log becomes a bit more explicative when there are OVS devices involved: <info> device (ovs-br)[Open vSwitch Bridge]: state change: ip-config -> ip-check (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br)[Open vSwitch Port]: state change: ip-check -> secondaries (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br)[Open vSwitch Port]: state change: secondaries -> activated (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br)[Open vSwitch Port]: Activation: successful, device activated. <info> device (ovs-br)[Open vSwitch Bridge]: state change: ip-check -> secondaries (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br)[Open vSwitch Bridge]: state change: secondaries -> activated (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br)[Open vSwitch Bridge]: Activation: successful, device activated. <info> device (ovs-br)[Open vSwitch Interface]: state change: unmanaged -> unavailable (reason 'managed', sys-iface-state: 'external') <info> device (ovs-br)[Open vSwitch Interface]: state change: unavailable -> disconnected (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br)[Open vSwitch Interface]: Activation: starting connection 'ovs-interface+' (d3d429b1-3193-4462-a17a-034255c43776) instead of: <info> device (ovs-br): state change: ip-config -> ip-check (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br): state change: ip-check -> secondaries (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br): state change: secondaries -> activated (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br): Activation: successful, device activated. <info> device (ovs-br): state change: ip-check -> secondaries (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br): state change: secondaries -> activated (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br): Activation: successful, device activated. <info> device (ovs-br): state change: unmanaged -> unavailable (reason 'managed', sys-iface-state: 'external') <info> device (ovs-br): state change: unavailable -> disconnected (reason 'none', sys-iface-state: 'managed') <info> device (ovs-br): Activation: starting connection 'ovs-interface+' (d3d429b1-3193-4462-a17a-034255c43776)
47 lines
3 KiB
C
47 lines
3 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2014 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NETWORKMANAGER_DEVICE_LOGGING_H__
|
|
#define __NETWORKMANAGER_DEVICE_LOGGING_H__
|
|
|
|
#include "nm-device.h"
|
|
|
|
#if !_NM_CC_SUPPORT_GENERIC
|
|
#define _NM_DEVICE_CAST(self) ((NMDevice *) (self))
|
|
#elif !defined(_NMLOG_DEVICE_TYPE)
|
|
#define _NM_DEVICE_CAST(self) _Generic((self), NMDevice *: ((NMDevice *) (self)))
|
|
#else
|
|
#define _NM_DEVICE_CAST(self) \
|
|
_Generic((self), _NMLOG_DEVICE_TYPE *: ((NMDevice *) (self)), NMDevice *: ((NMDevice *) (self)))
|
|
#endif
|
|
|
|
#undef _NMLOG_ENABLED
|
|
#define _NMLOG_ENABLED(level, domain) (nm_logging_enabled((level), (domain)))
|
|
#define _NMLOG(level, domain, ...) \
|
|
G_STMT_START \
|
|
{ \
|
|
const NMLogLevel _level = (level); \
|
|
const NMLogDomain _domain = (domain); \
|
|
\
|
|
if (nm_logging_enabled(_level, _domain)) { \
|
|
typeof(*self) *const _self = (self); \
|
|
const char *const _ifname = _nm_device_get_iface(_NM_DEVICE_CAST(_self)); \
|
|
const char *_type = nm_device_get_type_desc_for_log(_NM_DEVICE_CAST(_self)); \
|
|
\
|
|
nm_log_obj(_level, \
|
|
_domain, \
|
|
_ifname, \
|
|
NULL, \
|
|
_self, \
|
|
"device", \
|
|
"%s%s%s%s%s%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
|
|
NM_PRINT_FMT_QUOTED(_ifname, "(", _ifname, ")", "[null]"), \
|
|
NM_PRINT_FMT_QUOTED(_type, "[", _type, "]", "") \
|
|
_NM_UTILS_MACRO_REST(__VA_ARGS__)); \
|
|
} \
|
|
} \
|
|
G_STMT_END
|
|
|
|
#endif /* __NETWORKMANAGER_DEVICE_LOGGING_H__ */
|