From: Peter Krempa <[email protected]> The implementation uses 'virDomainQemuMonitorEventStateRegisterID' internally. To have a top level flag validation for the upcoming flag introspection export the supported flags as a macro and add a 'virCheckFlags'.
Signed-off-by: Peter Krempa <[email protected]> --- src/conf/domain_event.c | 4 +--- src/conf/domain_event.h | 5 +++++ src/qemu/qemu_driver.c | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 88087bad4f..4fb0f68ae9 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -2471,9 +2471,7 @@ virDomainQemuMonitorEventStateRegisterID(virConnectPtr conn, return -1; if (flags != -1) - virCheckFlags(VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX | - VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCASE, - -1); + virCheckFlags(VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_FLAGS, -1); data = g_new0(virDomainQemuMonitorEventData, 1); data->flags = flags; if (event && flags != -1) { diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index f31cfb9e42..63ecd66b21 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -334,6 +334,11 @@ virDomainEventStateDeregister(virConnectPtr conn, virConnectDomainEventCallback callback) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + +#define VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_FLAGS \ + VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX | \ + VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCASE + int virDomainQemuMonitorEventStateRegisterID(virConnectPtr conn, virObjectEventState *state, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1eef19d3ff..758dbbe19f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16352,6 +16352,8 @@ qemuConnectDomainQemuMonitorEventRegister(virConnectPtr conn, virQEMUDriver *driver = conn->privateData; int ret = -1; + virCheckFlags(VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_FLAGS, -1); + if (virConnectDomainQemuMonitorEventRegisterEnsureACL(conn) < 0) return -1; -- 2.54.0
