mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
pr-manager-helper: report event on connection/disconnection
Let management know if there were any problems communicating with qemu-pr-helper. The event is edge-triggered, and is sent every time the connection status of the pr-manager-helper object changes. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
5f64089416
commit
e2c81a4510
|
@ -358,6 +358,30 @@
|
|||
{ 'event': 'DEVICE_TRAY_MOVED',
|
||||
'data': { 'device': 'str', 'id': 'str', 'tray-open': 'bool' } }
|
||||
|
||||
##
|
||||
# @PR_MANAGER_STATUS_CHANGED:
|
||||
#
|
||||
# Emitted whenever the connected status of a persistent reservation
|
||||
# manager changes.
|
||||
#
|
||||
# @id: The id of the PR manager object
|
||||
#
|
||||
# @connected: true if the PR manager is connected to a backend
|
||||
#
|
||||
# Since: 3.0
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# <- { "event": "PR_MANAGER_STATUS_CHANGED",
|
||||
# "data": { "id": "pr-helper0",
|
||||
# "connected": true
|
||||
# },
|
||||
# "timestamp": { "seconds": 1519840375, "microseconds": 450486 } }
|
||||
#
|
||||
##
|
||||
{ 'event': 'PR_MANAGER_STATUS_CHANGED',
|
||||
'data': { 'id': 'str', 'connected': 'bool' } }
|
||||
|
||||
##
|
||||
# @QuorumOpType:
|
||||
#
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include "io/channel.h"
|
||||
#include "io/channel-socket.h"
|
||||
#include "pr-helper.h"
|
||||
#include "qapi/qapi-events-block.h"
|
||||
|
||||
#include <scsi/sg.h>
|
||||
|
||||
|
@ -38,6 +39,16 @@ typedef struct PRManagerHelper {
|
|||
QIOChannel *ioc;
|
||||
} PRManagerHelper;
|
||||
|
||||
static void pr_manager_send_status_changed_event(PRManagerHelper *pr_mgr)
|
||||
{
|
||||
char *id = object_get_canonical_path_component(OBJECT(pr_mgr));
|
||||
|
||||
if (id) {
|
||||
qapi_event_send_pr_manager_status_changed(id, !!pr_mgr->ioc,
|
||||
&error_abort);
|
||||
}
|
||||
}
|
||||
|
||||
/* Called with lock held. */
|
||||
static int pr_manager_helper_read(PRManagerHelper *pr_mgr,
|
||||
void *buf, int sz, Error **errp)
|
||||
|
@ -47,6 +58,7 @@ static int pr_manager_helper_read(PRManagerHelper *pr_mgr,
|
|||
if (r < 0) {
|
||||
object_unref(OBJECT(pr_mgr->ioc));
|
||||
pr_mgr->ioc = NULL;
|
||||
pr_manager_send_status_changed_event(pr_mgr);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -72,6 +84,7 @@ static int pr_manager_helper_write(PRManagerHelper *pr_mgr,
|
|||
assert(n_written != QIO_CHANNEL_ERR_BLOCK);
|
||||
object_unref(OBJECT(pr_mgr->ioc));
|
||||
pr_mgr->ioc = NULL;
|
||||
pr_manager_send_status_changed_event(pr_mgr);
|
||||
return n_written < 0 ? -EINVAL : 0;
|
||||
}
|
||||
|
||||
|
@ -127,6 +140,7 @@ static int pr_manager_helper_initialize(PRManagerHelper *pr_mgr,
|
|||
goto out_close;
|
||||
}
|
||||
|
||||
pr_manager_send_status_changed_event(pr_mgr);
|
||||
return 0;
|
||||
|
||||
out_close:
|
||||
|
|
Loading…
Reference in a new issue