This commit completes the multitouch integration by adding the VIR_DOMAIN_INPUT_TYPE_MULTITOUCH case to all remaining enum switch statements throughout the codebase.
Updated files: - src/conf/domain_audit.c - src/conf/domain_conf.c - src/conf/domain_validate.c - src/security/security_dac.c - src/security/security_selinux.c These additions ensure that multitouch devices are fully integrated with libvirt's security, auditing, and validation infrastructure. Without these changes, multitouch devices would trigger warnings about unhandled enum values or potentially cause security labeling failures. Signed-off-by: Julio Faracco <[email protected]> --- src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_validate.c | 1 + src/security/security_dac.c | 2 ++ src/security/security_selinux.c | 2 ++ 5 files changed, 7 insertions(+) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 7a6bb02203..1dee7d76fc 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -922,6 +922,7 @@ virDomainAuditInput(virDomainObj *vm, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: + case VIR_DOMAIN_INPUT_TYPE_MULTITOUCH: break; case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index aeb81fc42f..84496478b0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2080,6 +2080,7 @@ const char *virDomainInputDefGetPath(virDomainInputDef *input) case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: + case VIR_DOMAIN_INPUT_TYPE_MULTITOUCH: case VIR_DOMAIN_INPUT_TYPE_LAST: return NULL; diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 7346a61731..e36927985e 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2877,6 +2877,7 @@ virDomainInputDefValidate(const virDomainInputDef *input, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: + case VIR_DOMAIN_INPUT_TYPE_MULTITOUCH: if (input->source.evdev) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("setting source evdev path only supported for passthrough input devices")); diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 2f788b872a..44038e194f 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1841,6 +1841,7 @@ virSecurityDACSetInputLabel(virSecurityManager *mgr, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: + case VIR_DOMAIN_INPUT_TYPE_MULTITOUCH: case VIR_DOMAIN_INPUT_TYPE_LAST: ret = 0; break; @@ -1865,6 +1866,7 @@ virSecurityDACRestoreInputLabel(virSecurityManager *mgr, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: + case VIR_DOMAIN_INPUT_TYPE_MULTITOUCH: case VIR_DOMAIN_INPUT_TYPE_LAST: ret = 0; break; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 2f3cc274a5..5177b38be0 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1605,6 +1605,7 @@ virSecuritySELinuxSetInputLabel(virSecurityManager *mgr, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: + case VIR_DOMAIN_INPUT_TYPE_MULTITOUCH: case VIR_DOMAIN_INPUT_TYPE_LAST: break; } @@ -1632,6 +1633,7 @@ virSecuritySELinuxRestoreInputLabel(virSecurityManager *mgr, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: + case VIR_DOMAIN_INPUT_TYPE_MULTITOUCH: case VIR_DOMAIN_INPUT_TYPE_LAST: break; } -- 2.52.0
