qemuConnectDomainQemuMonitorEventRegister: Add top-level flag validation

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 <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 17ad4a0d2c917b400f30b186022b417914add3b8..f09c6a98164fb781961cb553a30cd48acbce6a5e 100644 (file)
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -2537,9 +2537,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 1b1b16095a7764803ddb2c228e93bae35647bfcf..930b66b13a7967bb6ed1279481a215e747790c97 100644 (file)
--- a/src/conf/domain_event.h
+++ b/src/conf/domain_event.h
@@ -340,6 +340,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 6ab17b89d44fcc0c47137b6a5cc9fe358eaeb867..2b061c56e55c92a6697a8b9d1fe360ac2bcd672a 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -16358,6 +16358,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;