[libvirt] [PATCH 0/2] two cosmetic fixes to netlink code
I pushed the following under the trivial rule yesterday. Much to my discredit, I screwed up twice: 1) I ran git send-email to send the patches to the list along with a "pushed under trivial rule" message, but then got distracted in the middle of the OOOOH!!!! Something shiny!! - yes, just like that - and ended up not hitting the final send confirmation, so the list was never notified. 2) My re-ordering to alphabetize the list of functions wasn't complete - my visual scans aren't as thorough as those of Eric, who noticed that virNetlinkEventServiceStop was still placed before virNetlinkEventServiceStart. As penance for this transgression, I forced myself to actually get a full night's sleep last night. Maybe in the future I'll be more alert.
--- src/util/virnetlink.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 0a1c121..264fcdb 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -270,7 +270,7 @@ virNetlinkEventCallback(int watch, * stop the monitor to receive netlink messages for libvirtd. * This removes the netlink socket fd from the event handler. * - * returns -1 if the monitor cannot be unregistered, 0 upon success + * Returns -1 if the monitor cannot be unregistered, 0 upon success */ int virNetlinkEventServiceStop(void) @@ -305,9 +305,9 @@ virNetlinkEventServiceStop(void) /** * virNetlinkEventServiceIsRunning: * - * returns if the netlink event service is running. + * Returns if the netlink event service is running. * - * returns 'true' if the service is running, 'false' if stopped. + * Returns 'true' if the service is running, 'false' if stopped. */ bool virNetlinkEventServiceIsRunning(void) @@ -321,7 +321,7 @@ virNetlinkEventServiceIsRunning(void) * start a monitor to receive netlink messages for libvirtd. * This registers a netlink socket with the event interface. * - * returns -1 if the monitor cannot be registered, 0 upon success + * Returns -1 if the monitor cannot be registered, 0 upon success */ int virNetlinkEventServiceStart(void) @@ -410,13 +410,15 @@ error: * @handleCB: callback to invoke when an event occurs * @removeCB: callback to invoke when removing a client * @opaque: user data to pass to callback - * @macaddr: macaddr to store with the data. Used to identify callers. May be null. + * @macaddr: macaddr to store with the data. Used to identify callers. + * May be null. * * register a callback for handling of netlink messages. The * registered function receives the entire netlink message and * may choose to act upon it. * - * returns -1 if the file handle cannot be registered, number of monitor upon success + * Returns -1 if the file handle cannot be registered, number of + * monitor upon success. */ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, @@ -481,7 +483,7 @@ error: * The handler function referenced will no longer receive netlink messages. * Either watch or macaddr may be used, the other should be null. * - * returns -1 if the file handle was not registered, 0 upon success + * Returns -1 if the file handle was not registered, 0 upon success */ int virNetlinkEventRemoveClient(int watch, const unsigned char *macaddr) @@ -538,7 +540,8 @@ int virNetlinkCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED, } /** - * stopNetlinkEventServer: stop the monitor to receive netlink messages for libvirtd + * stopNetlinkEventServer: stop the monitor to receive netlink + * messages for libvirtd */ int virNetlinkEventServiceStop(void) { @@ -551,7 +554,8 @@ int virNetlinkEventServiceStop(void) } /** - * startNetlinkEventServer: start a monitor to receive netlink messages for libvirtd + * startNetlinkEventServer: start a monitor to receive netlink + * messages for libvirtd */ int virNetlinkEventServiceStart(void) { @@ -564,7 +568,8 @@ int virNetlinkEventServiceStart(void) } /** - * virNetlinkEventServiceIsRunning: returns if the netlink event service is running. + * virNetlinkEventServiceIsRunning: returns if the netlink event + * service is running. */ int virNetlinkEventServiceIsRunning(void) { @@ -577,7 +582,8 @@ int virNetlinkEventServiceIsRunning(void) } /** - * virNetlinkEventAddClient: register a callback for handling of netlink messages + * virNetlinkEventAddClient: register a callback for handling of + * netlink messages */ int virNetlinkEventAddClient(virNetlinkEventHandleCallback cb, virNetlinkEventRemoveCallback cb, -- 1.7.7.6
--- src/libvirt_private.syms | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ce4b7f7..a104e70 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1271,12 +1271,11 @@ virNetDevVPortProfileOpTypeToString; #virnetlink.h virNetlinkCommand; +virNetlinkEventAddClient; +virNetlinkEventRemoveClient; virNetlinkEventServiceIsRunning; virNetlinkEventServiceStop; virNetlinkEventServiceStart; -virNetlinkEventAddClient; -virNetlinkEventRemoveClient; - # virnetmessage.h -- 1.7.7.6
participants (1)
-
Laine Stump